diff options
| author | Brian Paul <[email protected]> | 2009-08-12 17:25:49 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-08-12 17:28:45 -0600 |
| commit | fdfb0d4b0e04bff2f3dbae2d1f8e3765fb4b0dce (patch) | |
| tree | 4988e4af1cd8fc6d439ca11fd7eda05bad2feaee /progs/glsl/bump.c | |
| parent | af3d7f68894b00a750fa2be72935ab95b5b50d28 (diff) | |
progs/glsl: change uniform_info::type field to use GLSL vector types
Diffstat (limited to 'progs/glsl/bump.c')
| -rw-r--r-- | progs/glsl/bump.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/progs/glsl/bump.c b/progs/glsl/bump.c index 29af26f7a1f..c0d39c049d3 100644 --- a/progs/glsl/bump.c +++ b/progs/glsl/bump.c @@ -24,11 +24,11 @@ static GLuint program; static struct uniform_info Uniforms[] = { - { "LightPosition", 3, GL_FLOAT, { 0.57737, 0.57735, 0.57735, 0.0 }, -1 }, - { "SurfaceColor", 3, GL_FLOAT, { 0.8, 0.8, 0.2, 0 }, -1 }, - { "BumpDensity", 1, GL_FLOAT, { 10.0, 0, 0, 0 }, -1 }, - { "BumpSize", 1, GL_FLOAT, { 0.125, 0, 0, 0 }, -1 }, - { "SpecularFactor", 1, GL_FLOAT, { 0.5, 0, 0, 0 }, -1 }, + { "LightPosition", 1, GL_FLOAT_VEC3, { 0.57737, 0.57735, 0.57735, 0.0 }, -1 }, + { "SurfaceColor", 1, GL_FLOAT_VEC3, { 0.8, 0.8, 0.2, 0 }, -1 }, + { "BumpDensity", 1, GL_FLOAT, { 10.0, 0, 0, 0 }, -1 }, + { "BumpSize", 1, GL_FLOAT, { 0.125, 0, 0, 0 }, -1 }, + { "SpecularFactor", 1, GL_FLOAT, { 0.5, 0, 0, 0 }, -1 }, END_OF_UNIFORMS }; |