diff options
| author | Eric Anholt <eric@anholt.net> | 2012-06-25 10:23:24 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-07-20 10:43:33 -0700 |
| commit | abcdbdf9cce3c7520ee999fac3099d609960847d (patch) | |
| tree | fd3c3bb8d17baff017aeea9819d04fd695c31a6b /src/mesa/main/uniforms.h | |
| parent | f609cf782ab5e90ddf045dc4b0da8cebf99be0d1 (diff) | |
| download | external_mesa3d-abcdbdf9cce3c7520ee999fac3099d609960847d.zip external_mesa3d-abcdbdf9cce3c7520ee999fac3099d609960847d.tar.gz external_mesa3d-abcdbdf9cce3c7520ee999fac3099d609960847d.tar.bz2 | |
mesa: Move the _mesa_uniform_merge_location_offset to glGetUniformLocation().
With the upcoming GL_ARB_uniform_buffer_object changes, the only
other caller that will want the cooked value is state_tracker.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/uniforms.h')
| -rw-r--r-- | src/mesa/main/uniforms.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 7b512a5..a94dbd6 100644 --- 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, |