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/multitex.c | |
| parent | af3d7f68894b00a750fa2be72935ab95b5b50d28 (diff) | |
progs/glsl: change uniform_info::type field to use GLSL vector types
Diffstat (limited to 'progs/glsl/multitex.c')
| -rw-r--r-- | progs/glsl/multitex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/glsl/multitex.c b/progs/glsl/multitex.c index ce79bc1b4d5..6ec9c833e67 100644 --- a/progs/glsl/multitex.c +++ b/progs/glsl/multitex.c @@ -59,8 +59,8 @@ static GLint VertCoord_attr = -1, TexCoord0_attr = -1, TexCoord1_attr = -1; /* value[0] = tex unit */ static struct uniform_info Uniforms[] = { - { "tex1", 1, GL_INT, { 0, 0, 0, 0 }, -1 }, - { "tex2", 1, GL_INT, { 1, 0, 0, 0 }, -1 }, + { "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 }, + { "tex2", 1, GL_SAMPLER_2D, { 1, 0, 0, 0 }, -1 }, END_OF_UNIFORMS }; |