Mesa (mesa_7_6_branch): progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.
Vinson Lee
vlee at kemper.freedesktop.org
Sat Dec 5 09:13:34 UTC 2009
Module: Mesa
Branch: mesa_7_6_branch
Commit: d642edd2d10e93c32077a729b13a7c7b0d37d25b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d642edd2d10e93c32077a729b13a7c7b0d37d25b
Author: Vinson Lee <vlee at vmware.com>
Date: Sat Dec 5 01:11:26 2009 -0800
progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.
The return type of glGetUniformLocationARB is GLint, not GLuint.
---
progs/vpglsl/vp-tris.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/progs/vpglsl/vp-tris.c b/progs/vpglsl/vp-tris.c
index b2b0508..6a1fa3d 100644
--- a/progs/vpglsl/vp-tris.c
+++ b/progs/vpglsl/vp-tris.c
@@ -84,9 +84,9 @@ static void check_link(GLuint prog)
static void setup_uniforms()
{
{
- GLuint loc1f = glGetUniformLocationARB(program, "Offset1f");
- GLuint loc2f = glGetUniformLocationARB(program, "Offset2f");
- GLuint loc4f = glGetUniformLocationARB(program, "Offset4f");
+ GLint loc1f = glGetUniformLocationARB(program, "Offset1f");
+ GLint loc2f = glGetUniformLocationARB(program, "Offset2f");
+ GLint loc4f = glGetUniformLocationARB(program, "Offset4f");
GLfloat vecKer[] =
{ 1.0, 0.0, 0.0, 1.0,
0.0, 1.0, 0.0, 1.0,
@@ -105,9 +105,9 @@ static void setup_uniforms()
}
{
- GLuint loc1f = glGetUniformLocationARB(program, "KernelValue1f");
- GLuint loc2f = glGetUniformLocationARB(program, "KernelValue2f");
- GLuint loc4f = glGetUniformLocationARB(program, "KernelValue4f");
+ GLint loc1f = glGetUniformLocationARB(program, "KernelValue1f");
+ GLint loc2f = glGetUniformLocationARB(program, "KernelValue2f");
+ GLint loc4f = glGetUniformLocationARB(program, "KernelValue4f");
GLfloat vecKer[] =
{ 1.0, 0.0, 0.0, 0.25,
0.0, 1.0, 0.0, 0.25,
More information about the mesa-commit
mailing list