summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/objects
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/objects
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/objects')
-rw-r--r--indra/newview/app_settings/shaders/class1/objects/bumpV.glsl2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl b/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl
index bb6f0aa5e8..7d38e07d65 100644
--- a/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/bumpV.glsl
@@ -25,7 +25,6 @@
attribute vec3 position;
-attribute vec4 diffuse_color;
attribute vec2 texcoord0;
attribute vec2 texcoord1;
@@ -35,5 +34,4 @@ void main()
gl_Position = gl_ModelViewProjectionMatrix*vec4(position.xyz, 1.0);
gl_TexCoord[0] = gl_TextureMatrix[0] * vec4(texcoord0,0,1);
gl_TexCoord[1] = gl_TextureMatrix[1] * vec4(texcoord1,0,1);
- gl_FrontColor = diffuse_color;
}