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

mesa: implement glGetUniformiv() with new ctx->Driver function 

The old implementation could overwrite the caller's param buffer.
This commit is contained in:
Brian Paul 2008-07-08 16:17:04 -06:00
parent 44029f15a8
commit 2be54a8e8c
3 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/dd.h
View File

@ -868,6 +868,8 @@ struct dd_function_table {
GLsizei *length, GLcharARB *sourceOut);
void (*GetUniformfv)(GLcontext *ctx, GLuint program, GLint location,
GLfloat *params);
void (*GetUniformiv)(GLcontext *ctx, GLuint program, GLint location,
GLint *params);
GLint (*GetUniformLocation)(GLcontext *ctx, GLuint program,
const GLcharARB *name);
GLboolean (*IsProgram)(GLcontext *ctx, GLuint name);

7
src/mesa/main/shaders.c
View File

@ -128,6 +128,7 @@ _mesa_DeleteObjectARB(GLhandleARB obj)
void GLAPIENTRY
_mesa_DeleteProgram(GLuint name)
{
printf("%s name=%u\n", __FUNCTION__, name);
if (name) {
GET_CURRENT_CONTEXT(ctx);
ctx->Driver.DeleteProgram2(ctx, name);
@ -309,11 +310,7 @@ void GLAPIENTRY
_mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint * params)
{
GET_CURRENT_CONTEXT(ctx);
GLfloat fparams[16]; /* XXX is 16 enough? */
GLuint i;
ctx->Driver.GetUniformfv(ctx, program, location, fparams);
for (i = 0; i < 16; i++)
params[i] = (GLint) fparams[i]; /* XXX correct? */
ctx->Driver.GetUniformiv(ctx, program, location, params);
}

45
src/mesa/shader/shader_api.c
View File

@ -955,12 +955,15 @@ _mesa_get_shader_source(GLcontext *ctx, GLuint shader, GLsizei maxLength,
}
#define MAX_UNIFORM_ELEMENTS 16
/**
* Called via ctx->Driver.GetUniformfv().
* Helper for GetUniformfv(), GetUniformiv()
* Returns number of elements written to 'params' output.
*/
static void
_mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
GLfloat *params)
static GLuint
get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
GLfloat *params)
{
struct gl_shader_program *shProg
= _mesa_lookup_shader_program(ctx, program);
@ -984,9 +987,13 @@ _mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
ASSERT(prog);
if (prog) {
/* See uniformiv() below */
assert(prog->Parameters->Parameters[progPos].Size <= MAX_UNIFORM_ELEMENTS);
for (i = 0; i < prog->Parameters->Parameters[progPos].Size; i++) {
params[i] = prog->Parameters->ParameterValues[progPos][i];
}
return prog->Parameters->Parameters[progPos].Size;
}
}
else {
@ -996,6 +1003,35 @@ _mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
else {
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniformfv(program)");
}
return 0;
}
/**
* Called via ctx->Driver.GetUniformfv().
*/
static void
_mesa_get_uniformfv(GLcontext *ctx, GLuint program, GLint location,
GLfloat *params)
{
(void) get_uniformfv(ctx, program, location, params);
}
/**
* Called via ctx->Driver.GetUniformiv().
*/
static void
_mesa_get_uniformiv(GLcontext *ctx, GLuint program, GLint location,
GLint *params)
{
GLfloat fparams[MAX_UNIFORM_ELEMENTS];
GLuint n = get_uniformfv(ctx, program, location, fparams);
GLuint i;
assert(n <= MAX_UNIFORM_ELEMENTS);
for (i = 0; i < n; i++) {
params[i] = (GLint) fparams[i];
}
}
@ -1413,6 +1449,7 @@ _mesa_init_glsl_driver_functions(struct dd_function_table *driver)
driver->GetShaderInfoLog = _mesa_get_shader_info_log;
driver->GetShaderSource = _mesa_get_shader_source;
driver->GetUniformfv = _mesa_get_uniformfv;
driver->GetUniformiv = _mesa_get_uniformiv;
driver->GetUniformLocation = _mesa_get_uniform_location;
driver->IsProgram = _mesa_is_program;
driver->IsShader = _mesa_is_shader;