From 826bd47cc1355844dea7cfc838ba5f685b91251e Mon Sep 17 00:00:00 2001
From: Ptolemy <ptolemy@lindenlab.com>
Date: Mon, 29 Aug 2022 14:08:27 -0700
Subject: SL-17703: PBR: Fix default OMR if pbr shader compiled sans
HAS_SPECULAR_MAP
---
.../app_settings/shaders/class1/deferred/pbropaqueF.glsl | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
(limited to 'indra')
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;
--
cgit v1.2.3