From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 4 Aug 2008 22:27:14 +0000 (-0600)
Subject: mesa: glsl: check struct types in _slang_assignment_compatible()
X-Git-Tag: 062012170305~17580^2~390^2~762
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d8551b30f38d111b60511700c690db1e5b2ab16;p=profile%2Fivi%2Fmesa.git

mesa: glsl: check struct types in _slang_assignment_compatible()
---

diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index b699430..1c87f56 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -2851,7 +2851,20 @@ _slang_assignment_compatible(const slang_typeinfo *t0,
                              const slang_typeinfo *t1)
 
 {
-#if 01 /* not used just yet - causes problems elsewhere */
+#if 0
+   GLuint sz0 = _slang_sizeof_type_specifier(&t0->spec);
+   GLuint sz1 = _slang_sizeof_type_specifier(&t1->spec);
+
+   if (sz0 != sz1)
+      return GL_FALSE;
+#endif
+
+   if (t0->spec.type == SLANG_SPEC_STRUCT &&
+       t1->spec.type == SLANG_SPEC_STRUCT &&
+       t0->spec._struct->a_name != t1->spec._struct->a_name)
+      return GL_FALSE;
+
+#if 0 /* not used just yet - causes problems elsewhere */
    if (t0->spec.type == SLANG_SPEC_INT &&
        t1->spec.type == SLANG_SPEC_FLOAT)
       return GL_FALSE;