diff options
| author | Ian Romanick <[email protected]> | 2011-10-11 17:02:06 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-11-07 13:33:15 -0800 |
| commit | 4ad41af616fed7ad0b6980f7181c9db9b95a6732 (patch) | |
| tree | 7c3bb7a73e8ecd8383c8a67577f732ebab25c948 /src/mesa | |
| parent | fa7eccb8c0c590535856a54e3697982af6a630ed (diff) | |
mesa: Make get_uniform available outside compilation unit
Also rename to _mesa_get_uniform.
Signed-off-by: Ian Romanick <[email protected]>
Tested-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/uniforms.c | 14 | ||||
| -rw-r--r-- | src/mesa/main/uniforms.h | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c index 6403137756a..3170cc80a58 100644 --- a/src/mesa/main/uniforms.c +++ b/src/mesa/main/uniforms.c @@ -370,9 +370,9 @@ split_location_offset(GLint *location, GLint *offset) /** * Called via glGetUniform[fiui]v() to get the current value of a uniform. */ -static void -get_uniform(struct gl_context *ctx, GLuint program, GLint location, - GLsizei bufSize, GLenum returnType, GLvoid *paramsOut) +void +_mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location, + GLsizei bufSize, GLenum returnType, GLvoid *paramsOut) { struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetUniformfv"); @@ -1344,7 +1344,7 @@ _mesa_GetnUniformfvARB(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); - get_uniform(ctx, program, location, bufSize, GL_FLOAT, params); + _mesa_get_uniform(ctx, program, location, bufSize, GL_FLOAT, params); } void GLAPIENTRY @@ -1359,7 +1359,7 @@ _mesa_GetnUniformivARB(GLhandleARB program, GLint location, GLsizei bufSize, GLint *params) { GET_CURRENT_CONTEXT(ctx); - get_uniform(ctx, program, location, bufSize, GL_INT, params); + _mesa_get_uniform(ctx, program, location, bufSize, GL_INT, params); } void GLAPIENTRY @@ -1375,7 +1375,7 @@ _mesa_GetnUniformuivARB(GLhandleARB program, GLint location, GLsizei bufSize, GLuint *params) { GET_CURRENT_CONTEXT(ctx); - get_uniform(ctx, program, location, bufSize, GL_UNSIGNED_INT, params); + _mesa_get_uniform(ctx, program, location, bufSize, GL_UNSIGNED_INT, params); } void GLAPIENTRY @@ -1398,7 +1398,7 @@ _mesa_GetnUniformdvARB(GLhandleARB program, GLint location, (void) params; /* - get_uniform(ctx, program, location, bufSize, GL_DOUBLE, params); + _mesa_get_uniform(ctx, program, location, bufSize, GL_DOUBLE, params); */ _mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformdvARB" "(GL_ARB_gpu_shader_fp64 not implemented)"); diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index 77f55d47d49..5c1ddedf7a4 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -184,6 +184,10 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg, GLint location, GLsizei count, GLboolean transpose, const GLfloat *values); +void +_mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location, + GLsizei bufSize, GLenum returnType, GLvoid *paramsOut); + extern void _mesa_update_shader_textures_used(struct gl_program *prog); |