mesa: Move the _mesa_uniform_merge_location_offset to glGetUniformLocation().

[mesa.git] / src / mesa / main / uniforms.h

diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
index 7b512a527597b5fd0d7a246ce3453936f53a7f4c..a94dbd63bcbb2cb7bca531ba1aee845d45d1c979 100644 (file)
--- a/src/mesa/main/uniforms.h
+++ b/src/mesa/main/uniforms.h
@@ -176,9 +176,9 @@ _mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *);
 extern GLint GLAPIENTRY
 _mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *);
 
-GLint
+unsigned
 _mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,
-                          const GLchar *name);
+                          const GLchar *name, unsigned *offset);
 
 void
 _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shader_program,