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/brick.shtest | |
| parent | 823703418edd4a65f88b892567dc904664d4e3f8 (diff) | |
progs/glsl: add type field to shtest config files
Plus, texture loading.
Diffstat (limited to 'progs/glsl/brick.shtest')
| -rw-r--r-- | progs/glsl/brick.shtest | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/progs/glsl/brick.shtest b/progs/glsl/brick.shtest index c806a0fc54..8a2152692e 100644 --- a/progs/glsl/brick.shtest +++ b/progs/glsl/brick.shtest @@ -1,8 +1,8 @@ vs CH06-brick.vert fs CH06-brick.frag -uniform LightPosition 0.1 0.1 9.0 -uniform BrickColor 0.8 0.2 0.2 -uniform MortarColor 0.6 0.6 0.6 -uniform BrickSize 1.0 0.3 -uniform BrickPct 0.9 0.8 +uniform LightPosition GL_FLOAT_VEC3 0.1 0.1 9.0 +uniform BrickColor GL_FLOAT_VEC3 0.8 0.2 0.2 +uniform MortarColor GL_FLOAT_VEC3 0.6 0.6 0.6 +uniform BrickSize GL_FLOAT_VEC2 1.0 0.3 +uniform BrickPct GL_FLOAT_VEC2 0.9 0.8 |