fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: refactor GetActiveUniformsiv, use _mesa_program_resource_prop

Browse source 
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Tapani Pälli 2015-03-12 10:17:09 +02:00
parent 34df5ebd77
commit 7519ddb4d8
1 changed files with 40 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
src/mesa/main/uniform_query.cpp
View file

@ -79,6 +79,33 @@ _mesa_GetActiveUniform(GLuint program, GLuint index,
} }
} }
static GLenum
resource_prop_from_uniform_prop(GLenum uni_prop)
{
switch (uni_prop) {
case GL_UNIFORM_TYPE:
return GL_TYPE;
case GL_UNIFORM_SIZE:
return GL_ARRAY_SIZE;
case GL_UNIFORM_NAME_LENGTH:
return GL_NAME_LENGTH;
case GL_UNIFORM_BLOCK_INDEX:
return GL_BLOCK_INDEX;
case GL_UNIFORM_OFFSET:
return GL_OFFSET;
case GL_UNIFORM_ARRAY_STRIDE:
return GL_ARRAY_STRIDE;
case GL_UNIFORM_MATRIX_STRIDE:
return GL_MATRIX_STRIDE;
case GL_UNIFORM_IS_ROW_MAJOR:
return GL_IS_ROW_MAJOR;
case GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX:
return GL_ATOMIC_COUNTER_BUFFER_INDEX;
default:
return 0;
}
}
extern "C" void GLAPIENTRY extern "C" void GLAPIENTRY
_mesa_GetActiveUniformsiv(GLuint program, _mesa_GetActiveUniformsiv(GLuint program,
GLsizei uniformCount, GLsizei uniformCount,
@ -88,7 +115,8 @@ _mesa_GetActiveUniformsiv(GLuint program,
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
struct gl_shader_program *shProg; struct gl_shader_program *shProg;
GLsizei i; struct gl_program_resource *res;
GLenum res_prop;
if (uniformCount < 0) { if (uniformCount < 0) {
_mesa_error(ctx, GL_INVALID_VALUE, _mesa_error(ctx, GL_INVALID_VALUE,
@ -100,80 +128,21 @@ _mesa_GetActiveUniformsiv(GLuint program,
if (!shProg) if (!shProg)
return; return;
for (i = 0; i < uniformCount; i++) { res_prop = resource_prop_from_uniform_prop(pname);
GLuint index = uniformIndices[i];
if (index >= shProg->NumUserUniformStorage) { for (int i = 0; i < uniformCount; i++) {
_mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniformsiv(index)"); res = _mesa_program_resource_find_index(shProg, GL_UNIFORM,
return; uniformIndices[i]);
} if (!res) {
} _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniformsiv(index)");
for (i = 0; i < uniformCount; i++) {
GLuint index = uniformIndices[i];
const struct gl_uniform_storage *uni = &shProg->UniformStorage[index];
switch (pname) {
case GL_UNIFORM_TYPE:
params[i] = uni->type->gl_type;
break;
case GL_UNIFORM_SIZE:
/* array_elements is zero for non-arrays, but the API requires that 1 be
* returned.
*/
params[i] = MAX2(1, uni->array_elements);
break;
case GL_UNIFORM_NAME_LENGTH:
params[i] = strlen(uni->name) + 1;
/* Page 61 (page 73 of the PDF) in section 2.11 of the OpenGL ES 3.0
* spec says:
*
* "If the active uniform is an array, the uniform name returned
* in name will always be the name of the uniform array appended
* with "[0]"."
*/
if (uni->array_elements != 0)
params[i] += 3;
break;
case GL_UNIFORM_BLOCK_INDEX:
params[i] = uni->block_index;
break;
case GL_UNIFORM_OFFSET:
params[i] = uni->offset;
break;
case GL_UNIFORM_ARRAY_STRIDE:
params[i] = uni->array_stride;
break;
case GL_UNIFORM_MATRIX_STRIDE:
params[i] = uni->matrix_stride;
break;
case GL_UNIFORM_IS_ROW_MAJOR:
params[i] = uni->row_major;
break;
case GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX:
if (!ctx->Extensions.ARB_shader_atomic_counters)
goto invalid_enum;
params[i] = uni->atomic_buffer_index;
break; break;
default:
goto invalid_enum;
} }
if (!_mesa_program_resource_prop(shProg, res, uniformIndices[i],
res_prop, &params[i],
"glGetActiveUniformsiv"))
break;
} }
return;
invalid_enum:
_mesa_error(ctx, GL_INVALID_ENUM, "glGetActiveUniformsiv(pname)");
} }
static struct gl_uniform_storage * static struct gl_uniform_storage *