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/class2/windlight | |
| 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/class2/windlight')
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl | 6 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/windlight/skyV.glsl | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl b/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl index 297b3904a6..67b5e7fb83 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/cloudsV.glsl @@ -22,7 +22,9 @@ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ - + +uniform mat4 modelview_projection_matrix; + attribute vec3 position; attribute vec2 texcoord0; @@ -60,7 +62,7 @@ void main() { // World / view / projection - gl_Position = gl_ModelViewProjectionMatrix * vec4(position.xyz, 1.0); + gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); gl_TexCoord[0] = vec4(texcoord0,0,1); diff --git a/indra/newview/app_settings/shaders/class2/windlight/skyV.glsl b/indra/newview/app_settings/shaders/class2/windlight/skyV.glsl index 84e1f827d6..50fdba64c2 100644 --- a/indra/newview/app_settings/shaders/class2/windlight/skyV.glsl +++ b/indra/newview/app_settings/shaders/class2/windlight/skyV.glsl @@ -23,6 +23,7 @@ * $/LicenseInfo$ */ +uniform mat4 modelview_projection_matrix; attribute vec3 position; attribute vec2 texcoord0; @@ -59,7 +60,7 @@ void main() { // World / view / projection - gl_Position = gl_ModelViewProjectionMatrix * vec4(position.xyz, 1.0); + gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0); gl_TexCoord[0] = vec4(texcoord0,0,1); // Get relative position |