Handle interface blocks in getVariableInfo and

getUserDefinedVariableInfo. BUG=angle:654 Change-Id: I07a230bbf2387e85168c50cb3719c669a7890f8a Reviewed-on: https://chromium-review.googlesource.com/199687Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Shannon Woods <shannonwoods@chromium.org>

Handle interface blocks in getVariableInfo and
b66feb31 · Dan Glastonbury · Shannon Woods · 1b2a8f96 · b66feb31
Commit b66feb31 authored May 14, 2014 by Dan Glastonbury Committed by Shannon Woods May 16, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

VariableInfo.cpp src/compiler/translator/VariableInfo.cpp +4 -3

No files found.
--- a/src/compiler/translator/VariableInfo.cpp
+++ b/src/compiler/translator/VariableInfo.cpp
@@ -136,7 +136,7 @@ void getVariableInfo(const TType& type,
                     TVariableInfoList& infoList,
                     ShHashFunction64 hashFunction)
 {
-    if (type.getBasicType() == EbtStruct) {
+    if (type.getBasicType() == EbtStruct || type.isInterfaceBlock()) {
        if (type.isArray()) {
            for (int i = 0; i < type.getArraySize(); ++i) {
                TString lname = name + arrayBrackets(i);
@@ -183,7 +183,9 @@ void getUserDefinedVariableInfo(const TType& type,
 {
    ASSERT(type.getBasicType() == EbtStruct || type.isInterfaceBlock());

-    const TFieldList& fields = type.getStruct()->fields();
+    const TFieldList& fields = type.isInterfaceBlock() ?
+        type.getInterfaceBlock()->fields() :
+        type.getStruct()->fields();
    for (size_t i = 0; i < fields.size(); ++i) {
        const TType& fieldType = *(fields[i]->type());
        const TString& fieldName = fields[i]->name();
@@ -370,4 +372,3 @@ bool CollectVariables::visitAggregate(Visit, TIntermAggregate* node)

    return visitChildren;
 }
-