diff options
| author | Ian Romanick <[email protected]> | 2011-08-18 15:22:21 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-10-04 13:17:47 -0700 |
| commit | c097c63aa880e2b84e6b1d78a8808d42864f72fc (patch) | |
| tree | 8cfb4f9a89e1b49be52dae79c5936bda15fbbe7f | |
| parent | a339ee8d852c08ce7af51a518e0b18b9f0ab324c (diff) | |
mesa: Determine GL_ACTIVE_ATTRIBUTES by walking the GLSL IR.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/main/shader_query.cpp | 27 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.h | 2 |
3 files changed, 30 insertions, 1 deletions
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 636ab0f8d0b..e9e6dbf7122 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -185,3 +185,30 @@ _mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name) return -1; } + + +unsigned +_mesa_count_active_attribs(struct gl_shader_program *shProg) +{ + if (!shProg->LinkStatus + || shProg->_LinkedShaders[MESA_SHADER_VERTEX] == NULL) { + return 0; + } + + exec_list *const ir = shProg->_LinkedShaders[MESA_SHADER_VERTEX]->ir; + unsigned i = 0; + + foreach_list(node, ir) { + const ir_variable *const var = ((ir_instruction *) node)->as_variable(); + + if (var == NULL + || var->mode != ir_var_in + || var->location == -1 + || var->location < VERT_ATTRIB_GENERIC0) + continue; + + i++; + } + + return i; +} diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index b13ec45df36..657de66e9a1 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -569,7 +569,7 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param *params = shProg->NumShaders; break; case GL_ACTIVE_ATTRIBUTES: - *params = attribs ? attribs->NumParameters : 0; + *params = _mesa_count_active_attribs(shProg); break; case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH: *params = _mesa_longest_parameter_name(attribs, PROGRAM_INPUT) + 1; diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index e4b477660dc..96747247204 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -50,6 +50,8 @@ _mesa_active_program(struct gl_context *ctx, struct gl_shader_program *shProg, extern void _mesa_init_shader_dispatch(struct _glapi_table *exec); +extern unsigned +_mesa_count_active_attribs(struct gl_shader_program *shProg); extern void GLAPIENTRY |