livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DRTVWR-592: Fix PBR terrain shader compile crash when emissive textures are disabled

meow-7.2.2
Cosmic Linden 2023-10-13 10:43:18 -07:00
parent 8d9933b370
commit cc0f831aaa
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
View File

@ -258,9 +258,15 @@ void main()
tnorm *= gl_FrontFacing ? 1.0 : -1.0;
#if (TERRAIN_PBR_DETAIL >= TERRAIN_PBR_DETAIL_EMISSIVE)
#define emissive mix.emissive
#else
#define emissive vec3(0)
#endif
frag_data[0] = max(vec4(mix.col.xyz, 0.0), vec4(0)); // Diffuse
frag_data[1] = max(vec4(mix.orm.rgb, base_color_factor_alpha), vec4(0)); // PBR linear packed Occlusion, Roughness, Metal.
frag_data[2] = max(vec4(encode_normal(tnorm), base_color_factor_alpha, GBUFFER_FLAG_HAS_PBR), vec4(0)); // normal, environment intensity, flags
frag_data[3] = max(vec4(mix.emissive,0), vec4(0)); // PBR sRGB Emissive
frag_data[3] = max(vec4(emissive,0), vec4(0)); // PBR sRGB Emissive
}

2
indra/newview/llviewershadermgr.cpp
View File

@ -695,6 +695,8 @@ std::string LLViewerShaderMgr::loadBasicShaders()
attribs["TERRAIN_PLANAR_TEXTURE_SAMPLE_COUNT"] = llformat("%d", mapping);
const F32 triplanar_factor = gSavedSettings.getF32("RenderTerrainPBRTriplanarBlendFactor");
attribs["TERRAIN_TRIPLANAR_BLEND_FACTOR"] = llformat("%.2f", triplanar_factor);
S32 detail = gSavedSettings.getS32("RenderTerrainPBRDetail");
attribs["TERRAIN_PBR_DETAIL"] = llformat("%d", detail);
}
LLGLSLShader::sGlobalDefines = attribs;