diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-02-01 22:26:24 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-02-01 22:26:24 +0000 |
| commit | cccb489cca16186da94cbea3a2a87cec2b88100e (patch) | |
| tree | 65365fff0125ba6ab8dbedc1e3ff84b7a832fad3 | |
| parent | 4ae7c00dc4afc85ede2d82d0269a8791f7e07761 (diff) | |
| parent | d7b2016e39cb298a0a105e624ecc7bcf9d7db187 (diff) | |
Merged in SL-14731 (pull request #455)
SL-14731: Fix sun gamma -- merge Sovereign Engineer's patch: Fix sun gamma space for accurate color reproduction of sun textures
Approved-by: Dave Houlton
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 81c44d2961..2f506e16ae 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1356,6 +1356,7 @@ Sovereign Engineer SL-11625 SL-14705 SL-14707 + SL-14731 SpacedOut Frye VWR-34 VWR-45 diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl index 454af2a9bc..b2fa5d8a25 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl @@ -49,10 +49,6 @@ void main() vec4 sunDiscB = texture2D(altDiffuseMap, vary_texcoord0.xy); vec4 c = mix(sunDiscA, sunDiscB, blend_factor); - c.rgb = srgb_to_linear(c.rgb); - c.rgb = clamp(c.rgb, vec3(0), vec3(1)); - c.rgb = pow(c.rgb, vec3(0.7f)); - //c.rgb = fullbrightAtmosTransport(c.rgb); c.rgb = fullbrightScaleSoftClip(c.rgb); diff --git a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl index b9ae7a0226..5a41dc644a 100644 --- a/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl +++ b/indra/newview/app_settings/shaders/class1/windlight/sunDiscF.glsl @@ -51,7 +51,6 @@ void main() // SL-9806 stars poke through // c.a *= sun_fade; - c.rgb = pow(c.rgb, vec3(0.7f)); c.rgb = fullbrightAtmosTransport(c.rgb); c.rgb = fullbrightScaleSoftClip(c.rgb); frag_color = c; |