summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred
diff options
context:
space:
mode:
authorBrad Linden <46733234+brad-linden@users.noreply.github.com>2023-09-20 14:45:03 -0700
committerGitHub <noreply@github.com>2023-09-20 14:45:03 -0700
commite02dc20b9db4c6ec192b2c68c4c732a26296fc20 (patch)
treebe25a3dff6011a3a8d07b7b29b53eb3aad17f253 /indra/newview/app_settings/shaders/class1/deferred
parent5b2de090c1ac44c415e8573e0d6b1136cd689f35 (diff)
parentbb7f023aaaaa2aaa747a131486390f739cc32ed3 (diff)
Merge pull request #379 from secondlife/davep/SL-19842
New GLTF protocol and lighting changes
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
index 53e4f02314..64e6bc9da2 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredGammaCorrect.glsl
@@ -105,7 +105,8 @@ vec3 toneMap(vec3 color)
color *= exposure * exp_scale;
- color = toneMapACES_Hill(color);
+ // mix ACES and Linear here as a compromise to avoid over-darkening legacy content
+ color = mix(toneMapACES_Hill(color), color, 0.333);
#endif
return color;