summaryrefslogtreecommitdiff
path: root/src/mesa/shader/prog_parameter.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-12-11 09:22:00 -0700
committerBrian Paul <brianp@vmware.com>2009-12-11 09:22:00 -0700
commitb605f4ff11c894500f2d0273c5d4653ff413448d (patch)
tree144a2202677b29020bfb0477d145a985cae3c29f /src/mesa/shader/prog_parameter.c
parentda3bc492d2438ac915e720c17b54d0d12ffd8a97 (diff)
parent5076a4f53a2f34cc9116b45951037f639885c7a1 (diff)
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Diffstat (limited to 'src/mesa/shader/prog_parameter.c')
-rw-r--r--src/mesa/shader/prog_parameter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 2f029b02e5..f22492e029 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -500,7 +500,7 @@ GLfloat *
_mesa_lookup_parameter_value(const struct gl_program_parameter_list *paramList,
GLsizei nameLen, const char *name)
{
- GLuint i = _mesa_lookup_parameter_index(paramList, nameLen, name);
+ GLint i = _mesa_lookup_parameter_index(paramList, nameLen, name);
if (i < 0)
return NULL;
else