diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-08-18 12:20:36 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-08-18 12:20:36 -0700 |
| commit | a512985fd81c1ed4ccc5e69aaa05015cf7ff844d (patch) | |
| tree | 69e6e898deaeaed2b4dfb5851707c68261c464de /progs/glsl/brick.shtest | |
| parent | 0b5af41c6fae2809f4567a7cecbd207e5e4f3ab5 (diff) | |
| parent | c80bc3abcd3939e5e2d45aea4b01ff22bfec244b (diff) | |
Merge branch 'master' into asm-shader-rework-1
Conflicts:
src/mesa/shader/arbprogparse.c
Diffstat (limited to 'progs/glsl/brick.shtest')
| -rw-r--r-- | progs/glsl/brick.shtest | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/progs/glsl/brick.shtest b/progs/glsl/brick.shtest new file mode 100644 index 0000000000..8a2152692e --- /dev/null +++ b/progs/glsl/brick.shtest @@ -0,0 +1,8 @@ +vs CH06-brick.vert +fs CH06-brick.frag +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 + |