From 744872b43d4b538a828dad116c46eed3d6d35436 Mon Sep 17 00:00:00 2001 From: Ptolemy Date: Fri, 13 Mar 2020 11:46:13 -0700 Subject: SL-12850 --- .../newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 6 +++--- .../newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'indra') diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index 547a159f3a..69a694a6cd 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -154,8 +154,6 @@ vec3 post_diffuse = color.rgb; } vec3 post_spec = color.rgb; - - color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a); if (envIntensity > 0.0) { //add environmentmap @@ -165,7 +163,9 @@ vec3 post_diffuse = color.rgb; color = mix(color.rgb, reflected_color, envIntensity*0.75); // MAGIC NUMBER SL-12574; ALM: On, Quality <= Mid+ #endif } - + else + color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a); + vec3 post_env = color.rgb; if (norm.w < 1) diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 15a3bc349a..63b0f0b5c8 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -161,8 +161,6 @@ vec3 post_diffuse = color.rgb; } vec3 post_spec = color.rgb; - - color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a); if (envIntensity > 0.0) { //add environmentmap @@ -170,9 +168,12 @@ vec3 post_diffuse = color.rgb; vec3 reflected_color = textureCube(environmentMap, env_vec).rgb; #if !defined(SUNLIGHT_KILL) color = mix(color.rgb, reflected_color, envIntensity*0.75); // MAGIC NUMBER SL-12574; ALM: On, Quality >= High +//color.rgb = reflected_color.rgb; #endif } - + else + color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a); + vec3 post_env = color.rgb; if (norm.w < 1) -- cgit v1.2.3 From bedbbdc5c39a4ae684c0b8e569dae4bb0d7b314c Mon Sep 17 00:00:00 2001 From: Ptolemy Date: Fri, 13 Mar 2020 12:35:12 -0700 Subject: SL-12850 remove debug --- indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 1 - 1 file changed, 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 63b0f0b5c8..a1366eec01 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -168,7 +168,6 @@ vec3 post_diffuse = color.rgb; vec3 reflected_color = textureCube(environmentMap, env_vec).rgb; #if !defined(SUNLIGHT_KILL) color = mix(color.rgb, reflected_color, envIntensity*0.75); // MAGIC NUMBER SL-12574; ALM: On, Quality >= High -//color.rgb = reflected_color.rgb; #endif } else -- cgit v1.2.3 From 3792c3c7debb428d9727136afaa8b16d312abd42 Mon Sep 17 00:00:00 2001 From: Ptolemy Date: Fri, 13 Mar 2020 12:37:14 -0700 Subject: SL-12850 Adhere to coding standard --- indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl | 2 ++ indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 2 ++ 2 files changed, 4 insertions(+) (limited to 'indra') diff --git a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl index 69a694a6cd..20ac78947b 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/softenLightF.glsl @@ -164,7 +164,9 @@ vec3 post_diffuse = color.rgb; #endif } else + { color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a); + } vec3 post_env = color.rgb; diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index a1366eec01..9c7a4df767 100644 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -171,7 +171,9 @@ vec3 post_diffuse = color.rgb; #endif } else + { color.rgb = mix(color.rgb, diffuse_srgb.rgb, diffuse_srgb.a); + } vec3 post_env = color.rgb; -- cgit v1.2.3