diff options
author | Dave Parks <davep@lindenlab.com> | 2011-08-21 16:23:50 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-08-21 16:23:50 -0500 |
commit | 90ebaeef9b629cb63e7a94a526478f2e340ff439 (patch) | |
tree | 14f61c7fc6c2c41cace22a9582075d54ad8181bc /indra/newview/app_settings/shaders/class1/deferred/treeV.glsl | |
parent | 63c420d8ddb7cc738877d2771b1c3b8972a4de09 (diff) | |
parent | ee4fdd2c18c722164d78a7305777fad6e49cba8b (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/treeV.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/treeV.glsl | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/treeV.glsl b/indra/newview/app_settings/shaders/class1/deferred/treeV.glsl index 01401028d6..2ec7398024 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/treeV.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/treeV.glsl @@ -24,16 +24,19 @@ */ +attribute vec3 position; +attribute vec3 normal; +attribute vec2 texcoord0; varying vec3 vary_normal; 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); - vary_normal = normalize(gl_NormalMatrix * gl_Normal); + vary_normal = normalize(gl_NormalMatrix * normal); - gl_FrontColor = gl_Color; + gl_FrontColor = vec4(1,1,1,1); } |