AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Make get_uniform available outside compilation unit

Browse Source 
Also rename to _mesa_get_uniform.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
Ian Romanick
2011-10-11 17:02:06 -07:00
parent fa7eccb8c0
commit 4ad41af616
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/uniforms.c
+7 -7
View File
@@ -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)");
src/mesa/main/uniforms.h
+4
View File
@@ -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);