fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: add packed varyings to program resource list

Browse source 
This makes sure that user is still able to query properties about
variables that have gotten packed by lower_packed_varyings pass.

Fixes following OpenGL ES 3.1 test:
   ES31-CTS.program_interface_query.separate-programs-vertex

v2: fix 'name included in packed list' check (Ilia Mirkin)
v3: iterate over instances of name using strtok_r (Ilia Mirkin)

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Marta Lofstedt <marta.lofstedt@intel.com>
This commit is contained in:
Tapani Pälli 2015-09-04 11:30:34 +03:00
parent a6b55beb78
commit 4639cea292
1 changed files with 76 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/glsl/linker.cpp
View file

@ -3087,6 +3087,35 @@ add_program_resource(struct gl_shader_program *prog, GLenum type,
return true;
}
/* Function checks if a variable var is a packed varying and
* if given name is part of packed varying's list.
*
* If a variable is a packed varying, it has a name like
* 'packed:a,b,c' where a, b and c are separate variables.
*/
static bool
included_in_packed_varying(ir_variable *var, const char *name)
{
if (strncmp(var->name, "packed:", 7) != 0)
return false;
char *list = strdup(var->name + 7);
assert(list);
bool found = false;
char *saveptr;
char *token = strtok_r(list, ",", &saveptr);
while (token) {
if (strcmp(token, name) == 0) {
found = true;
break;
}
token = strtok_r(NULL, ",", &saveptr);
}
free(list);
return found;
}
/**
* Function builds a stage reference bitmask from variable name.
*/
@ -3114,6 +3143,11 @@ build_stageref(struct gl_shader_program *shProg, const char *name,
if (var) {
unsigned baselen = strlen(var->name);
if (included_in_packed_varying(var, name)) {
stages |= (1 << i);
break;
}
/* Type needs to match if specified, otherwise we might
* pick a variable with same name but different interface.
*/
@ -3139,9 +3173,9 @@ build_stageref(struct gl_shader_program *shProg, const char *name,
static bool
add_interface_variables(struct gl_shader_program *shProg,
struct gl_shader *sh, GLenum programInterface)
exec_list *ir, GLenum programInterface)
{
foreach_in_list(ir_instruction, node, sh->ir) {
foreach_in_list(ir_instruction, node, ir) {
ir_variable *var = node->as_variable();
uint8_t mask = 0;
@ -3176,6 +3210,12 @@ add_interface_variables(struct gl_shader_program *shProg,
continue;
};
/* Skip packed varyings, packed varyings are handled separately
* by add_packed_varyings.
*/
if (strncmp(var->name, "packed:", 7) == 0)
continue;
if (!add_program_resource(shProg, programInterface, var,
build_stageref(shProg, var->name,
var->data.mode) | mask))
@ -3184,6 +3224,33 @@ add_interface_variables(struct gl_shader_program *shProg,
return true;
}
static bool
add_packed_varyings(struct gl_shader_program *shProg, int stage)
{
struct gl_shader *sh = shProg->_LinkedShaders[stage];
GLenum iface;
if (!sh || !sh->packed_varyings)
return true;
foreach_in_list(ir_instruction, node, sh->packed_varyings) {
ir_variable *var = node->as_variable();
if (var) {
switch (var->data.mode) {
case ir_var_shader_in:
iface = GL_PROGRAM_INPUT;
case ir_var_shader_out:
iface = GL_PROGRAM_OUTPUT;
}
if (!add_program_resource(shProg, iface, var,
build_stageref(shProg, var->name,
var->data.mode)))
return false;
}
}
return true;
}
/**
* Builds up a list of program resources that point to existing
* resource data.
@ -3216,12 +3283,17 @@ build_program_resource_list(struct gl_shader_program *shProg)
if (input_stage == MESA_SHADER_STAGES && output_stage == 0)
return;
if (!add_packed_varyings(shProg, input_stage))
return;
if (!add_packed_varyings(shProg, output_stage))
return;
/* Add inputs and outputs to the resource list. */
if (!add_interface_variables(shProg, shProg->_LinkedShaders[input_stage],
if (!add_interface_variables(shProg, shProg->_LinkedShaders[input_stage]->ir,
GL_PROGRAM_INPUT))
return;
if (!add_interface_variables(shProg, shProg->_LinkedShaders[output_stage],
if (!add_interface_variables(shProg, shProg->_LinkedShaders[output_stage]->ir,
GL_PROGRAM_OUTPUT))
return;