diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-01-30 18:56:32 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-01-30 18:56:32 -0600 |
| commit | c154f4f6da10df693cbe15e0fe291d5b3c423d32 (patch) | |
| tree | 2238b6034ee8d344aa003bc5a4703a72cb0c3322 /indra/newview/app_settings | |
| parent | 10b8dcc497599042655dcc4037c9ae98d494bd6f (diff) | |
| parent | 12afbacd83f07f5df11e15996b8f6357fb49b9b2 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflUtil.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl index b3da216b81..d054305767 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl @@ -34,4 +34,4 @@ float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, { collectedColor = vec4(0); return 0; -}
\ No newline at end of file +} diff --git a/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflUtil.glsl b/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflUtil.glsl index 570235a816..c355b671c0 100644 --- a/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflUtil.glsl +++ b/indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflUtil.glsl @@ -231,4 +231,4 @@ float tapScreenSpaceReflection(int totalSamples, vec2 tc, vec3 viewPos, vec3 n, } return min(float(hits), 1.0) * vignette; -}
\ No newline at end of file +} |