diff options
author | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-08-11 14:20:57 -0500 |
commit | 80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (patch) | |
tree | 623156a93d159ece460a31590701d7cbdc701cdc /indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl | |
parent | 610764fbfce75f54c95d4b10c2a8f9482a7a7b80 (diff) | |
parent | 2dd8ce53e4e0d14f2bc20796eb6bdf1ef12a65df (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl b/indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl index 723777bd3a..cb47f62bbf 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/impostorV.glsl @@ -5,13 +5,15 @@ * $/LicenseInfo$ */ - +attribute vec3 position; +attribute vec4 diffuse_color; +attribute vec2 texcoord0; void main() { //transform vertex - gl_Position = ftransform(); - gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; + gl_Position = gl_ModelViewProjectionMatrix * vec4(position.xyz, 1.0); + gl_TexCoord[0] = gl_TextureMatrix[0] * vec4(texcoord0,0,1); - gl_FrontColor = gl_Color; + gl_FrontColor = diffuse_color; } |