diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-03-12 14:34:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-12 14:34:51 -0500 |
| commit | f16a1bf0af97114f95722c177d26a67f847d31f8 (patch) | |
| tree | a7cce6883a34576ea312995f8b5f43b337f335bf /indra/newview/app_settings/shaders/class3/deferred | |
| parent | 5fca8915d8f44cdb2a4f7bb4715d61ba47043e5d (diff) | |
| parent | 457b720fd9b2ced6f288d4bbc71045cefaed4a49 (diff) | |
Merge pull request #974 from secondlife/965-eep-skies-too-bright-after-hdri-local-preview-merge
965 eep skies too bright after hdri local preview merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class3/deferred')
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl index 5cc7ea698a..9b9739ba22 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl @@ -191,11 +191,12 @@ void main() } else if (GET_GBUFFER_FLAG(GBUFFER_FLAG_HAS_HDRI)) { + // actual HDRI sky, just copy color value color = texture(emissiveRect, tc).rgb; } - else if (!GET_GBUFFER_FLAG(GBUFFER_FLAG_HAS_ATMOS)) + else if (GET_GBUFFER_FLAG(GBUFFER_FLAG_SKIP_ATMOS)) { - //should only be true of WL sky, just port over base color value + //should only be true of WL sky, port over base color value and scale for fake HDR color = texture(emissiveRect, tc).rgb; color = srgb_to_linear(color); color *= sky_hdr_scale; |