diff options
| author | Brian Paul <brianp@vmware.com> | 2009-08-13 15:53:49 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-08-13 17:03:56 -0600 |
| commit | 62d113216090cd093c7cc6373c9115e31f921e7c (patch) | |
| tree | 8040ade9eea69e27e407052a8a2d8b1e89e0ad5c /progs/glsl/toyball.shtest | |
| parent | 823703418edd4a65f88b892567dc904664d4e3f8 (diff) | |
progs/glsl: add type field to shtest config files
Plus, texture loading.
Diffstat (limited to 'progs/glsl/toyball.shtest')
| -rw-r--r-- | progs/glsl/toyball.shtest | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/progs/glsl/toyball.shtest b/progs/glsl/toyball.shtest index 2852ab043e..887663abd3 100644 --- a/progs/glsl/toyball.shtest +++ b/progs/glsl/toyball.shtest @@ -1,17 +1,17 @@ vs CH11-toyball.vert fs CH11-toyball.frag -uniform LightDir 0.57737 0.57735 0.57735 0.0 -uniform HVector 0.32506 0.32506 0.88808 0.0 -uniform BallCenter 0.0 0.0 0.0 1.0 -uniform SpecularColor 0.4 0.4 0.4 60.0 -uniform Red 0.6 0.0 0.0 1.0 -uniform Blue 0.0 0.3 0.6 1.0 -uniform Yellow 0.6 0.5 0.0 1.0 -uniform HalfSpace0 1.0 0.0 0.0 0.2 -uniform HalfSpace1 .309016994 0.951056516 0.0 0.2 -uniform HalfSpace2 -0.809016994 0.587785252 0.0 0.2 -uniform HalfSpace3 -0.809016994 -0.587785252 0.0 0.2 -uniform HalfSpace4 .309116994 -0.951056516 0.0 0.2 -uniform InOrOutInit -3.0 -uniform StripeWidth 0.3 -uniform FWidth .005 +uniform LightDir GL_FLOAT_VEC4 0.57737 0.57735 0.57735 0.0 +uniform HVector GL_FLOAT_VEC4 0.32506 0.32506 0.88808 0.0 +uniform BallCenter GL_FLOAT_VEC4 0.0 0.0 0.0 1.0 +uniform SpecularColor GL_FLOAT_VEC4 0.4 0.4 0.4 60.0 +uniform Red GL_FLOAT_VEC4 0.6 0.0 0.0 1.0 +uniform Blue GL_FLOAT_VEC4 0.0 0.3 0.6 1.0 +uniform Yellow GL_FLOAT_VEC4 0.6 0.5 0.0 1.0 +uniform HalfSpace0 GL_FLOAT_VEC4 1.0 0.0 0.0 0.2 +uniform HalfSpace1 GL_FLOAT_VEC4 .309016994 0.951056516 0.0 0.2 +uniform HalfSpace2 GL_FLOAT_VEC4 -0.809016994 0.587785252 0.0 0.2 +uniform HalfSpace3 GL_FLOAT_VEC4 -0.809016994 -0.587785252 0.0 0.2 +uniform HalfSpace4 GL_FLOAT_VEC4 .309116994 -0.951056516 0.0 0.2 +uniform InOrOutInit GL_FLOAT -3.0 +uniform StripeWidth GL_FLOAT 0.3 +uniform FWidth GL_FLOAT .005 |