diff options
author | Brian <brian@yutani.localnet.net> | 2007-02-26 13:11:20 -0700 |
---|---|---|
committer | Brian <brian@yutani.localnet.net> | 2007-02-26 13:11:20 -0700 |
commit | 25ea5ea27e7fa4bd7151723d7549a0c33ac1ceda (patch) | |
tree | 845f42be66305613b31728728109939c7b51bba7 /progs/glsl/CH11-toyball.vert.txt | |
parent | 32fbbf38b4358acd46569fd3c2b21fbc21e417a8 (diff) | |
parent | 3c1c999226859216b8af35c4806413b4488f21b4 (diff) |
Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1
Diffstat (limited to 'progs/glsl/CH11-toyball.vert.txt')
-rw-r--r-- | progs/glsl/CH11-toyball.vert.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/progs/glsl/CH11-toyball.vert.txt b/progs/glsl/CH11-toyball.vert.txt index 1aa7e9cac2..b7da3ac839 100644 --- a/progs/glsl/CH11-toyball.vert.txt +++ b/progs/glsl/CH11-toyball.vert.txt @@ -14,7 +14,11 @@ uniform vec4 BallCenter; // ball center in modelling coordinates void main() { - ECposition = gl_ModelViewMatrix * gl_Vertex; +//orig: ECposition = gl_ModelViewMatrix * gl_Vertex; + + ECposition = gl_TextureMatrix[0] * gl_Vertex; + ECposition = gl_ModelViewMatrix * ECposition; + ECballCenter = gl_ModelViewMatrix * BallCenter; gl_Position = ftransform(); } |