From: Eric Anholt <eric@anholt.net>
Date: Tue, 20 Jul 2010 23:38:23 +0000 (-0700)
Subject: glsl2: Don't claim a match on structure types with different field names.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b6e92ad7da9d4f00607caca90bd0b8853623a493;p=mesa.git

glsl2: Don't claim a match on structure types with different field names.

We regularly do lookups on the field names of the structure to find
the types within the struct, so returning a structure type with bad
names will lead to lots of error types being found.
---

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index d6799cf4283..6ca141ef481 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -438,10 +438,13 @@ glsl_type::record_key_compare(const void *a, const void *b)
    if (key1->length != key2->length)
       return 1;
 
-   for (unsigned i = 0; i < key1->length; i++)
-      /* FINISHME: Is the name of the structure field also significant? */
+   for (unsigned i = 0; i < key1->length; i++) {
       if (key1->fields.structure[i].type != key2->fields.structure[i].type)
 	 return 1;
+      if (strcmp(key1->fields.structure[i].name,
+		 key2->fields.structure[i].name) != 0)
+	 return 1;
+   }
 
    return 0;
 }