diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:54:25 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-15 00:54:25 -0500 |
| commit | 530981a2149a74e1dc003cea1bbc9dc392fcae60 (patch) | |
| tree | f629a2dbc004d23e0f9f056366290e397ec51caf /indra/newview/app_settings/shaders/class1/effects | |
| parent | 7c95af74f195c9ec4ebc0fc0264d98cd4a85be49 (diff) | |
SH-2243 work in progress -- no more deprecated built-in matrix state when using shaders.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/effects')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/effects/glowV.glsl | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl b/indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl index b5f6cb62d9..628489296f 100644 --- a/indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl +++ b/indra/newview/app_settings/shaders/class1/effects/glowExtractV.glsl @@ -23,13 +23,15 @@ * $/LicenseInfo$ */ +uniform mat4 modelview_projection_matrix; + attribute vec3 position; attribute vec2 texcoord0; void main() { - gl_Position = gl_ModelViewProjectionMatrix * vec4(position, 1.0); + gl_Position = modelview_projection_matrix * vec4(position, 1.0); gl_TexCoord[0].xy = texcoord0; } diff --git a/indra/newview/app_settings/shaders/class1/effects/glowV.glsl b/indra/newview/app_settings/shaders/class1/effects/glowV.glsl index e8fd7a796d..615ca6a0b4 100644 --- a/indra/newview/app_settings/shaders/class1/effects/glowV.glsl +++ b/indra/newview/app_settings/shaders/class1/effects/glowV.glsl @@ -23,6 +23,8 @@ * $/LicenseInfo$ */ +uniform mat4 modelview_projection_matrix; + attribute vec3 position; attribute vec2 texcoord0; @@ -30,7 +32,7 @@ uniform vec2 glowDelta; void main() { - gl_Position = gl_ModelViewProjectionMatrix * vec4(position, 1.0); + gl_Position = modelview_projection_matrix * vec4(position, 1.0); gl_TexCoord[0].xy = texcoord0 + glowDelta*(-3.5); gl_TexCoord[1].xy = texcoord0 + glowDelta*(-2.5); |