From: Nicolai Hähnle Date: Sun, 14 May 2017 18:03:10 +0000 (+0200) Subject: glsl: stop considering unnamed and named structures equal X-Git-Tag: upstream/18.1.0~8884 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=835b1435f22dda28c6d9309eef13010f4db54381;p=platform%2Fupstream%2Fmesa.git glsl: stop considering unnamed and named structures equal Previously, if an unnamed and a named struct contained the same fields, they were considered the same type during linking of globals. The discussion around commit e018ea81bf58 ("glsl: Structures must have same name to be considered same type.") doesn't seem to have considered this thoroughly, and I see no evidence that an unnamed struct should ever be considered to be the same type as a named struct. Reviewed-by: Timothy Arceri --- diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp index 063d3f1..188b72f 100644 --- a/src/compiler/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -927,13 +927,9 @@ glsl_type::record_compare(const glsl_type *b, bool match_locations) const * type definitions, and field names to be considered the same type." * * GLSL ES behaves the same (Ver 1.00 Sec 4.2.4, Ver 3.00 Sec 4.2.5). - * - * Note that we cannot force type name check when comparing unnamed - * structure types, these have a unique name assigned during parsing. */ - if (!this->is_anonymous() && !b->is_anonymous()) - if (strcmp(this->name, b->name) != 0) - return false; + if (strcmp(this->name, b->name) != 0) + return false; for (unsigned i = 0; i < this->length; i++) { if (this->fields.structure[i].type != b->fields.structure[i].type)