diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-13 15:25:32 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-13 15:25:32 -0500 |
| commit | ca5a6bb0b871de4aa5a719d34a1d2820acc31736 (patch) | |
| tree | 25d7e8464cb64d37df0d2d8e69a1908ce23d6f06 | |
| parent | 402ab8c8f657f050a2ea30ebe562008130cb9bcd (diff) | |
| parent | 1ea525a4bd63c9c6379bec7b1eb80860ee971ec0 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/pbralphaF.glsl | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/pbralphaV.glsl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbralphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbralphaF.glsl index c57ae3e51f..491b757b82 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/pbralphaF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/pbralphaF.glsl @@ -212,7 +212,7 @@ void main() tnorm = normalize(tnorm.xyz); norm.xyz = tnorm.xyz; -#if HAS_SHADOW +#ifdef HAS_SHADOW vec2 frag = vary_fragcoord.xy/vary_fragcoord.z*0.5+0.5; frag *= screen_res; scol = sampleDirectionalShadow(pos.xyz, norm.xyz, frag); diff --git a/indra/newview/app_settings/shaders/class1/deferred/pbralphaV.glsl b/indra/newview/app_settings/shaders/class1/deferred/pbralphaV.glsl index e0672f09e4..57a162ad51 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/pbralphaV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/pbralphaV.glsl @@ -94,7 +94,7 @@ void main() #endif gl_Position = vert; -#if HAS_SHADOW +#ifdef HAS_SHADOW vary_fragcoord.xyz = vert.xyz + vec3(0,0,near_clip); #endif |