summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorPtolemy <ptolemy@lindenlab.com>2022-08-29 14:08:27 -0700
committerPtolemy <ptolemy@lindenlab.com>2022-08-29 14:08:27 -0700
commit826bd47cc1355844dea7cfc838ba5f685b91251e (patch)
treea0730f3844b010c987241701b092be3de35c5c39 /indra/newview
parent71ae65ae175a33c7f60442f62b0ef59415528bf5 (diff)
SL-17703: PBR: Fix default OMR if pbr shader compiled sans HAS_SPECULAR_MAP
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl11
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl
index 87c1ff5517..b5c38bba04 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/pbropaqueF.glsl
@@ -104,15 +104,16 @@ void main()
tnorm = normalize(tnorm.xyz);
norm.xyz = normalize(tnorm.xyz);
+
// RGB = Occlusion, Roughness, Metal
- // default values
- // occlusion ?
- // roughness 1.0
- // metal 1.0
+ // default values, see LLViewerTexture::sDefaultPBRORMImagep
+ // occlusion 1.0
+ // roughness 0.0
+ // metal 0.0
#ifdef HAS_SPECULAR_MAP
vec3 spec = texture2D(specularMap, vary_texcoord2.xy).rgb;
#else
- vec3 spec = vec3(1,1,1);
+ vec3 spec = vec3(1,0,0);
#endif
spec.g *= roughnessFactor;