summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/objects/emissiveV.glsl
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/objects/emissiveV.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class1/objects/emissiveV.glsl14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/app_settings/shaders/class1/objects/emissiveV.glsl b/indra/newview/app_settings/shaders/class1/objects/emissiveV.glsl
index 77b0806bfc..e984deb0c8 100644
--- a/indra/newview/app_settings/shaders/class1/objects/emissiveV.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/emissiveV.glsl
@@ -28,8 +28,8 @@ uniform mat4 modelview_matrix;
uniform mat4 modelview_projection_matrix;
ATTRIBUTE vec3 position;
-ATTRIBUTE float texture_index;
-ATTRIBUTE float emissive;
+void passTextureIndex();
+ATTRIBUTE vec4 emissive;
ATTRIBUTE vec2 texcoord0;
VARYING vec4 vertex_color;
@@ -37,20 +37,20 @@ VARYING vec2 vary_texcoord0;
void calcAtmospherics(vec3 inPositionEye);
-VARYING float vary_texture_index;
-VARYING float fog_depth;
+
+
void main()
{
//transform vertex
- vary_texture_index = texture_index;
+ passTextureIndex();
gl_Position = modelview_projection_matrix * vec4(position.xyz, 1.0);
vary_texcoord0 = (texture_matrix0 * vec4(texcoord0,0,1)).xy;
vec4 pos = (modelview_matrix * vec4(position.xyz, 1.0));
calcAtmospherics(pos.xyz);
- vertex_color = vec4(0,0,0,emissive);
+ vertex_color = emissive;
- fog_depth = pos.z;
+
}