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

mesa: refactor GetAttribLocation

Browse Source 
Use program_resource_location to fetch location.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
This commit is contained in:
Tapani Pälli
2015-03-12 15:11:04 +02:00
parent 26c0394a96
commit 3d1544cc91
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/shader_query.cpp
+20 -22
View File
@@ -41,6 +41,10 @@ extern "C" {
#include "shaderapi.h"
}
static GLint
program_resource_location(struct gl_shader_program *shProg,
struct gl_program_resource *res, const char *name);
/**
* Declare convenience functions to return resource data in a given type.
* Warning! this is not type safe so be *very* careful when using these.
@@ -266,31 +270,25 @@ _mesa_GetAttribLocation(GLhandleARB program, const GLcharARB * name)
if (shProg->_LinkedShaders[MESA_SHADER_VERTEX] == NULL)
return -1;
exec_list *ir = shProg->_LinkedShaders[MESA_SHADER_VERTEX]->ir;
foreach_in_list(ir_instruction, node, ir) {
const ir_variable *const var = node->as_variable();
struct gl_program_resource *res =
_mesa_program_resource_find_name(shProg, GL_PROGRAM_INPUT, name);
/* The extra check against VERT_ATTRIB_GENERIC0 is because
* glGetAttribLocation cannot be used on "conventional" attributes.
*
* From page 95 of the OpenGL 3.0 spec:
*
* "If name is not an active attribute, if name is a conventional
* attribute, or if an error occurs, -1 will be returned."
*/
if (var == NULL
|| var->data.mode != ir_var_shader_in
|| var->data.location == -1
|| var->data.location < VERT_ATTRIB_GENERIC0)
continue;
if (!res)
return -1;
int index = get_matching_index(var, (const char *) name);
GLint loc = program_resource_location(shProg, res, name);
if (index >= 0)
return var->data.location + index - VERT_ATTRIB_GENERIC0;
}
return -1;
/* The extra check against against 0 is made because of builtin-attribute
* locations that have offset applied. Function program_resource_location
* can return built-in attribute locations < 0 and glGetAttribLocation
* cannot be used on "conventional" attributes.
*
* From page 95 of the OpenGL 3.0 spec:
*
* "If name is not an active attribute, if name is a conventional
* attribute, or if an error occurs, -1 will be returned."
*/
return (loc >= 0) ? loc : -1;
}