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/mandelbrot.shtest | |
| parent | 823703418edd4a65f88b892567dc904664d4e3f8 (diff) | |
progs/glsl: add type field to shtest config files
Plus, texture loading.
Diffstat (limited to 'progs/glsl/mandelbrot.shtest')
| -rw-r--r-- | progs/glsl/mandelbrot.shtest | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/progs/glsl/mandelbrot.shtest b/progs/glsl/mandelbrot.shtest index f5cca2295f..4f4e5c747e 100644 --- a/progs/glsl/mandelbrot.shtest +++ b/progs/glsl/mandelbrot.shtest @@ -1,14 +1,13 @@ vs CH18-mandel.vert fs CH18-mandel.frag -uniform LightPosition 0.1 0.1 9.0 -uniform SpecularContribution 0.5 -uniform DiffuseContribution 0.5 -uniform Shininess 20.0 -uniform Iterations 12 -uniform Zoom 0.125 -uniform Xcenter -1.5 -uniform Ycenter .005 -uniform InnerColor 1 0 0 -uniform OuterColor1 0 1 0 -uniform OuterColor2 0 0 1 - +uniform LightPosition GL_FLOAT_VEC3 0.1 0.1 9.0 +uniform SpecularContribution GL_FLOAT 0.5 +uniform DiffuseContribution GL_FLOAT 0.5 +uniform Shininess GL_FLOAT 20.0 +uniform Iterations GL_FLOAT 12 +uniform Zoom GL_FLOAT 0.125 +uniform Xcenter GL_FLOAT -1.5 +uniform Ycenter GL_FLOAT .005 +uniform InnerColor GL_FLOAT_VEC3 1 0 0 +uniform OuterColor1 GL_FLOAT_VEC3 0 1 0 +uniform OuterColor2 GL_FLOAT_VEC3 0 0 1 |