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

glsl: for anonymous struct matching use without_array() (v3)

Browse source 
With tessellation shaders we can have cases where we have
arrays of anon structs, so make sure we match using without_array().

Fixes:
GL45-CTS.tessellation_shader.tessellation_control_to_tessellation_evaluation.gl_in

v2:
test lengths match as well (Ilia)
v3:
descend array lengths to check for matches as well (Ilia)

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2016-06-06 10:33:51 +10:00
parent 6702c15810
commit 1f66a4b689
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/compiler/glsl/link_varyings.cpp
View file

@ -182,6 +182,25 @@ process_xfb_layout_qualifiers(void *mem_ctx, const gl_shader *sh,
return has_xfb_qualifiers;
}
static bool
anonymous_struct_type_matches(const glsl_type *output_type,
const glsl_type *to_match)
{
while (output_type->is_array() && to_match->is_array()) {
/* if the lengths at each level don't match fail. */
if (output_type->length != to_match->length)
return false;
output_type = output_type->fields.array;
to_match = to_match->fields.array;
}
if (output_type->is_array() || to_match->is_array())
return false;
return output_type->is_anonymous() &&
to_match->is_anonymous() &&
to_match->record_compare(output_type);
}
/**
* Validate the types and qualifiers of an output from one stage against the
* matching input to another stage.
@ -226,9 +245,7 @@ cross_validate_types_and_qualifiers(struct gl_shader_program *prog,
* fragment language."
*/
if (!output->type->is_array() || !is_gl_identifier(output->name)) {
bool anon_matches = output->type->is_anonymous() &&
type_to_match->is_anonymous() &&
type_to_match->record_compare(output->type);
bool anon_matches = anonymous_struct_type_matches(output->type, type_to_match);
if (!anon_matches) {
linker_error(prog,