OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: fix cross validation for explicit locations on structs and arrays

Browse Source 
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri
2015-12-24 10:33:45 +11:00
parent 39e9cf6cb1
commit 72b5d00c9c
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/compiler/glsl/link_varyings.cpp
View File

@@ -367,18 +367,24 @@ cross_validate_outputs_to_inputs(struct gl_shader_program *prog,
/* User-defined varyings with explicit locations are handled /* User-defined varyings with explicit locations are handled
* differently because they do not need to have matching names. * differently because they do not need to have matching names.
*/ */
const unsigned idx = var->data.location - VARYING_SLOT_VAR0; const glsl_type *type = get_varying_type(var, producer->Stage);
unsigned num_elements = type->count_attribute_slots(false);
unsigned idx = var->data.location - VARYING_SLOT_VAR0;
unsigned slot_limit = idx + num_elements;
if (explicit_locations[idx] != NULL) { while (idx < slot_limit) {
linker_error(prog, if (explicit_locations[idx] != NULL) {
linker_error(prog,
"%s shader has multiple outputs explicitly " "%s shader has multiple outputs explicitly "
"assigned to location %d\n", "assigned to location %d\n",
_mesa_shader_stage_to_string(producer->Stage), _mesa_shader_stage_to_string(producer->Stage),
idx); idx);
return; return;
} }
explicit_locations[idx] = var; explicit_locations[idx] = var;
idx++;
}
} }
} }
@@ -426,14 +432,25 @@ cross_validate_outputs_to_inputs(struct gl_shader_program *prog,
ir_variable *output = NULL; ir_variable *output = NULL;
if (input->data.explicit_location if (input->data.explicit_location
&& input->data.location >= VARYING_SLOT_VAR0) { && input->data.location >= VARYING_SLOT_VAR0) {
output = explicit_locations[input->data.location - VARYING_SLOT_VAR0];
if (output == NULL) { const glsl_type *type = get_varying_type(input, consumer->Stage);
linker_error(prog, unsigned num_elements = type->count_attribute_slots(false);
"%s shader input `%s' with explicit location " unsigned idx = input->data.location - VARYING_SLOT_VAR0;
"has no matching output\n", unsigned slot_limit = idx + num_elements;
_mesa_shader_stage_to_string(consumer->Stage),
input->name); while (idx < slot_limit) {
output = explicit_locations[idx];
if (output == NULL ||
input->data.location != output->data.location) {
linker_error(prog,
"%s shader input `%s' with explicit location "
"has no matching output\n",
_mesa_shader_stage_to_string(consumer->Stage),
input->name);
break;
}
idx++;
} }
} else { } else {
output = parameters.get_variable(input->name); output = parameters.get_variable(input->name);