fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-27 16:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: Make _mesa_GetActiveAttribARB use the attributes in the shader IR

Browse source 
Instead of relying on the mirror in the Mesa IR assembly shader, just
use the variables actually stored in the GLSL IR.  This will be a bit
slower, but nobody cares about the performance of glGetActiveAttrib.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick 2011-08-18 15:06:07 -07:00
parent 7a80c1bbc5
commit 84d71a07bb
1 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/mesa/main/shader_query.cpp
View file

@ -33,6 +33,7 @@
#include "ir.h"
#include "shaderobj.h"
#include "program/hash_table.h"
#include "../glsl/program.h"
extern "C" {
#include "shaderapi.h"
@ -85,35 +86,59 @@ _mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
}
void GLAPIENTRY
_mesa_GetActiveAttribARB(GLhandleARB program, GLuint index,
_mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index,
GLsizei maxLength, GLsizei * length, GLint * size,
GLenum * type, GLcharARB * name)
{
GET_CURRENT_CONTEXT(ctx);
const struct gl_program_parameter_list *attribs = NULL;
struct gl_shader_program *shProg;
shProg = _mesa_lookup_shader_program_err(ctx, program, "glGetActiveAttrib");
if (!shProg)
return;
if (shProg->VertexProgram)
attribs = shProg->VertexProgram->Base.Attributes;
if (!attribs || index >= attribs->NumParameters) {
_mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveAttrib(index)");
if (!shProg->LinkStatus) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glGetActiveAttrib(program not linked)");
return;
}
_mesa_copy_string(name, maxLength, length,
attribs->Parameters[index].Name);
if (shProg->_LinkedShaders[MESA_SHADER_VERTEX] == NULL) {
_mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveAttrib(no vertex shader)");
return;
}
if (size)
*size = attribs->Parameters[index].Size
/ _mesa_sizeof_glsl_type(attribs->Parameters[index].DataType);
exec_list *const ir = shProg->_LinkedShaders[MESA_SHADER_VERTEX]->ir;
unsigned current_index = 0;
if (type)
*type = attribs->Parameters[index].DataType;
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;
if (current_index == desired_index) {
_mesa_copy_string(name, maxLength, length, var->name);
if (size)
*size = (var->type->is_array()) ? var->type->length : 1;
if (type)
*type = var->type->gl_type;
return;
}
current_index++;
}
/* If the loop did not return early, the caller must have asked for
* an index that did not exit. Set an error.
*/
_mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveAttrib(index)");
}
GLint GLAPIENTRY