summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-27 14:26:53 -0500
committerDave Parks <davep@lindenlab.com>2011-09-27 14:26:53 -0500
commitd0b5a521f21ab8002fb5d9a4d11cee6c2385dbf3 (patch)
tree4a56445866f63851cf02c5eb77cdcc1f7d463fc2 /indra/newview/app_settings/shaders/class1/deferred
parent328cf0d1c71efa785b0f1201c27776a3a6d6a041 (diff)
SH-2244 Make emissive attribute match actual number of components coming in
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/emissiveV.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/emissiveV.glsl b/indra/newview/app_settings/shaders/class1/deferred/emissiveV.glsl
index 50e92c191b..7b108e4562 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/emissiveV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/emissiveV.glsl
@@ -29,7 +29,7 @@ uniform mat4 modelview_projection_matrix;
ATTRIBUTE vec3 position;
ATTRIBUTE float texture_index;
-ATTRIBUTE float emissive;
+ATTRIBUTE vec4 emissive;
ATTRIBUTE vec2 texcoord0;
void calcAtmospherics(vec3 inPositionEye);
@@ -57,7 +57,7 @@ void main()
calcAtmospherics(pos.xyz);
- vertex_color = vec4(0,0,0,emissive);
+ vertex_color = emissive;
fog_depth = pos.z;
}