diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-09 13:10:45 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-09 13:10:45 -0700 |
| commit | e8bd9afbe6fab36bb7016cee8c3f3a745e9bd02d (patch) | |
| tree | b1b5dfe66cd2013c33e8141844aff7d5c2479843 /indra/newview/app_settings/shaders/class2/deferred | |
| parent | 93df4ff2fea7378ab5b5ac069c2fec808ec5027b (diff) | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
Merge viewer-release 3.6.5 Cocoa
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl | 3 | ||||
| -rwxr-xr-x | indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl index ed3458963d..c20e00163c 100755 --- a/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl @@ -24,6 +24,7 @@ */ #extension GL_ARB_texture_rectangle : enable +#extension GL_ARB_shader_texture_lod : enable #ifdef DEFINE_GL_FRAGCOLOR out vec4 frag_color; @@ -338,7 +339,7 @@ void main() if (stc.z > 0.0) { float fatten = clamp(envIntensity*envIntensity+envIntensity*0.25, 0.25, 1.0); - + stc.xy = (stc.xy - vec2(0.5)) * fatten + vec2(0.5); if (stc.x < 1.0 && diff --git a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl index bb6afbbf62..7689b72d20 100755 --- a/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl @@ -24,6 +24,7 @@ */ #extension GL_ARB_texture_rectangle : enable +#extension GL_ARB_shader_texture_lod : enable #ifdef DEFINE_GL_FRAGCOLOR out vec4 frag_color; @@ -352,7 +353,7 @@ void main() } } } - + //not sure why, but this line prevents MATBUG-194 col = max(col, vec3(0.0)); |