commit 28167c62a29c4514b52304ddc748eaa2616053c9
author Jamie Madill <jmadill@chromium.org> Fri Aug 30 13:21:10 2013 -0400
committer Jamie Madill <jmadill@chromium.org> Mon Sep 09 15:27:51 2013 -0400
tree 7dc4211d0251ede26f5d79c76a686817a0af2381
parent 94599669c4e464eaaf104828aa121497891dc71b

Add support for struct varyings, and more robust varying link validation.

TRAC #23749

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index 4f3e83b..28d9812 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -3569,7 +3569,7 @@
    }
     else
     {
-        InterfaceBlockField structField(GL_NONE, GL_NONE, name.c_str(), (unsigned int)type.getArraySize(), false);
+        InterfaceBlockField structField(GL_STRUCT_ANGLEX, GL_NONE, name.c_str(), (unsigned int)type.getArraySize(), false);
 
         const TFieldList &fields = structure->fields();
 
@@ -3603,7 +3603,7 @@
    }
     else
     {
-        Uniform structUniform(GL_NONE, GL_NONE, name.c_str(), (unsigned int)type.getArraySize(), (unsigned int)registerIndex);
+        Uniform structUniform(GL_STRUCT_ANGLEX, GL_NONE, name.c_str(), (unsigned int)type.getArraySize(), (unsigned int)registerIndex);
 
         int fieldRegister = registerIndex;
         const TFieldList &fields = structure->fields();
@@ -3658,9 +3658,11 @@
     }
     else
     {
-        Varying structVarying(GL_NONE, GL_NONE, name.c_str(), (unsigned int)type.getArraySize(), interpolation);
+        Varying structVarying(GL_STRUCT_ANGLEX, GL_NONE, name.c_str(), (unsigned int)type.getArraySize(), interpolation);
         const TFieldList &fields = structure->fields();
 
+        structVarying.structName = structure->name().c_str();
+
         for (size_t fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++)
         {
             const TField &field = *fields[fieldIndex];