diff options
author | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
---|---|---|
committer | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
commit | 1b0e3d68183fb63ac5c160bc9aa7956746f33faf (patch) | |
tree | 260f0972726dc9d8957486f2e03773dac4a10afc /indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl | |
parent | 7772ed0cb2ebf81d4e6b1a35dcffdfe88f6c1bcc (diff) | |
parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) |
Merge branch 'master' into DRTVWR-531
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl b/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl index d29e8a9423..eb6e56e718 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/impostorF.glsl @@ -40,6 +40,8 @@ uniform sampler2D specularMap; VARYING vec2 vary_texcoord0; +vec3 linear_to_srgb(vec3 c); + void main() { vec4 col = texture2D(diffuseMap, vary_texcoord0.xy); @@ -52,6 +54,7 @@ void main() vec4 norm = texture2D(normalMap, vary_texcoord0.xy); vec4 spec = texture2D(specularMap, vary_texcoord0.xy); + col.rgb = linear_to_srgb(col.rgb); frag_data[0] = vec4(col.rgb, 0.0); frag_data[1] = spec; frag_data[2] = vec4(norm.xy,0,0); |