diff options
| author | Brian Paul <brianp@vmware.com> | 2009-08-12 17:25:49 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-08-12 17:28:45 -0600 |
| commit | fdfb0d4b0e04bff2f3dbae2d1f8e3765fb4b0dce (patch) | |
| tree | 4988e4af1cd8fc6d439ca11fd7eda05bad2feaee /progs/glsl/brick.c | |
| parent | af3d7f68894b00a750fa2be72935ab95b5b50d28 (diff) | |
progs/glsl: change uniform_info::type field to use GLSL vector types
Diffstat (limited to 'progs/glsl/brick.c')
| -rw-r--r-- | progs/glsl/brick.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/progs/glsl/brick.c b/progs/glsl/brick.c index e5f5c96607..0653c592e5 100644 --- a/progs/glsl/brick.c +++ b/progs/glsl/brick.c @@ -24,12 +24,12 @@ static GLuint program; static struct uniform_info Uniforms[] = { /* vert */ - { "LightPosition", 3, GL_FLOAT, { 0.1, 0.1, 9.0, 0}, -1 }, + { "LightPosition", 1, GL_FLOAT_VEC3, { 0.1, 0.1, 9.0, 0}, -1 }, /* frag */ - { "BrickColor", 3, GL_FLOAT, { 0.8, 0.2, 0.2, 0 }, -1 }, - { "MortarColor", 3, GL_FLOAT, { 0.6, 0.6, 0.6, 0 }, -1 }, - { "BrickSize", 2, GL_FLOAT, { 1.0, 0.3, 0, 0 }, -1 }, - { "BrickPct", 2, GL_FLOAT, { 0.9, 0.8, 0, 0 }, -1 }, + { "BrickColor", 1, GL_FLOAT_VEC3, { 0.8, 0.2, 0.2, 0 }, -1 }, + { "MortarColor", 1, GL_FLOAT_VEC3, { 0.6, 0.6, 0.6, 0 }, -1 }, + { "BrickSize", 1, GL_FLOAT_VEC2, { 1.0, 0.3, 0, 0 }, -1 }, + { "BrickPct", 1, GL_FLOAT_VEC2, { 0.9, 0.8, 0, 0 }, -1 }, END_OF_UNIFORMS }; |