From fdfb0d4b0e04bff2f3dbae2d1f8e3765fb4b0dce Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 12 Aug 2009 17:25:49 -0600
Subject: progs/glsl: change uniform_info::type field to use GLSL vector types

---
 progs/glsl/multitex.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'progs/glsl/multitex.c')

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
 };
 
-- 
cgit v1.2.3