diff options
author | Graham Linden <graham@lindenlab.com> | 2019-04-02 16:21:51 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-04-02 16:21:51 -0700 |
commit | 4a0f3db9a4d741d3c2f9bf4c028670de587f3330 (patch) | |
tree | e3ba397125f7cfb3abead5f96bb50e65823522f4 /indra/newview/app_settings/shaders | |
parent | 02a4740c1bf5f68810fe2cab226d54236add3892 (diff) |
SL-10857
Juggle forced frag depths for moon/sun/stars/sky to get depth fighting with distant terrain...wait for it...sorted.
Diffstat (limited to 'indra/newview/app_settings/shaders')
5 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl b/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl index e257b668c8..7732cf986e 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl @@ -64,6 +64,6 @@ void main() frag_data[1] = vec4(0.0); frag_data[2] = vec4(0.0f); - gl_FragDepth = 0.9996f; + gl_FragDepth = 0.99985f; } diff --git a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl index f8172cae17..72b7aa9036 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/skyF.glsl @@ -58,6 +58,6 @@ void main() frag_data[1] = vec4(0.0,0.0,0.0,0.0); frag_data[2] = vec4(0.5,0.5,0.0,1.0); //1.0 in norm.w masks off fog - gl_FragDepth = 0.999f; + gl_FragDepth = 0.99999f; } diff --git a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl index 8a98d6a489..bac79a9fdc 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl @@ -62,6 +62,6 @@ void main() frag_data[1] = vec4(0.0f); frag_data[2] = vec4(0.0, 1.0, 0.0, 1.0); - gl_FragDepth = 0.9998; + gl_FragDepth = 0.99995f; } diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl index 1fb337498c..d06cb43129 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl @@ -59,6 +59,6 @@ void main() frag_data[1] = vec4(0.0f); frag_data[2] = vec4(0.0, 1.0, 0.0, 1.0); - gl_FragDepth = 0.9997f; + gl_FragDepth = 0.99988f; } diff --git a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl index d7b2a9cc8e..f73fc0079b 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl @@ -66,8 +66,8 @@ void main() outColor = applyWaterFogView(pos.xyz, outColor); #endif - frag_data[0] = vec4(outColor.rgb, 0.0); - frag_data[1] = vec4(0,0,0,0); + frag_data[0] = vec4(outColor.rgb, 1.0); + frag_data[1] = vec4(0.66,0.86,0.66,0.05f); vec3 nvn = normalize(vary_normal); frag_data[2] = vec4(encode_normal(nvn.xyz), 0.0, 0.0); } |