diff options
author | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:39:02 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:39:02 -0500 |
commit | f076bdf609ec1fe114a7d0222a318483c97c7a26 (patch) | |
tree | 93dbd2a949d60daaf6aaa025ca7cf036cf90a929 /indra/newview/app_settings/shaders/class1/interface/uiV.glsl | |
parent | f302e119627090c22325df59c40e1762402a08c6 (diff) | |
parent | b9439ac006ac64179180ec2a47f6bd92468de455 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/uiV.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/interface/uiV.glsl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/uiV.glsl b/indra/newview/app_settings/shaders/class1/interface/uiV.glsl index 9ca6cae5c5..ebf2361da4 100644 --- a/indra/newview/app_settings/shaders/class1/interface/uiV.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/uiV.glsl @@ -6,11 +6,15 @@ */ +attribute vec3 position; +attribute vec4 diffuse_color; +attribute vec2 texcoord0; + void main() { - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - gl_TexCoord[0] = gl_MultiTexCoord0; - gl_FrontColor = gl_Color; + gl_Position = gl_ModelViewProjectionMatrix * vec4(position, 1); + gl_TexCoord[0] = vec4(texcoord0,0,1); + gl_FrontColor = diffuse_color; } |