diff options
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl index 7eba8689b3..bd6ba4bf15 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl @@ -277,9 +277,7 @@ void main() vec3 kDiffuse = colorDiffuse * (1.0 - FssEssLambert + FmsEms); colorDiffuse += (FmsEms + kDiffuse) * irradiance; - float occlusion_strength = 1.0; // TODO: From glb - float ao = packedORM.r; - colorDiffuse = mix(colorDiffuse, colorDiffuse * ao, occlusion_strength); + colorDiffuse *= packedORM.r; // Occlusion -- NOTE: pbropaque will need occlusion_strength pre-multiplied into spec.r color.rgb = colorDiffuse + colorEmissive + colorSpec; @@ -293,7 +291,7 @@ void main() color.rgb = vec3(metal); #endif #if DEBUG_PBR_OCCLUSION - color.rgb = vec3(ao); + color.rgb = vec3(packedORM.r); #endif #if DEBUG_PBR_ORM color.rgb = packedORM; |