summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-08-27 00:38:53 -0500
committerDave Parks <davep@lindenlab.com>2011-08-27 00:38:53 -0500
commit7821ff23baafff4e7712a126c17c3947e7b4989e (patch)
tree06702d7c7787c5003c1d50953dd08b07a899210d /indra/newview/app_settings/shaders/class1/deferred
parentbf0d36bf889bb913fbc2a53c5a1b9818acb11ee6 (diff)
SH-2242 Physics shape display works again, added asserts to flush out areas where state being consumed by a shader does not match state being provided by vertex buffers.
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl b/indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl
index 99ddeaf0b9..b724def93d 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/bumpV.glsl
@@ -27,7 +27,7 @@ attribute vec3 position;
attribute vec4 diffuse_color;
attribute vec3 normal;
attribute vec2 texcoord0;
-attribute vec2 texcoord2;
+attribute vec3 binormal;
varying vec3 vary_mat0;
varying vec3 vary_mat1;
@@ -40,7 +40,7 @@ void main()
gl_TexCoord[0] = gl_TextureMatrix[0] * vec4(texcoord0,0,1);
vec3 n = normalize(gl_NormalMatrix * normal);
- vec3 b = normalize(gl_NormalMatrix * vec4(texcoord2,0,1).xyz);
+ vec3 b = normalize(gl_NormalMatrix * binormal);
vec3 t = cross(b, n);
vary_mat0 = vec3(t.x, b.x, n.x);