commit 98493ddc137922a6ce5c8b22ffde0ed2a1fa2b3d
author Jamie Madill <jmadill@transgaming.com> Mon Jul 08 14:39:03 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:08:08 2013 -0400
tree 552b49eb532c750feb840a3a98499d531a6e4dfa
parent f386bf76d5751e0bfa2073ca57210c73d8b85809

Simplified TType class by carving out TStructure and TField.

R=kbr@chromium.org

Review URL: https://codereview.appspot.com/9866043

git-svn-id: https://angleproject.googlecode.com/svn/trunk@2423 736b8ea6-26fd-11df-bfd4-992fa37f6226

TRAC #23415
Authored-by: alokp@chromium.org
Signed-off-by: Shannon Woods
Signed-off-by Nicolas Capens
Merged-by: Jamie Madill

src/compiler/FlagStd140Structs.cpp

diff --git a/src/compiler/FlagStd140Structs.cpp b/src/compiler/FlagStd140Structs.cpp
index 1aaf50b..bcf33d2 100644
--- a/src/compiler/FlagStd140Structs.cpp
+++ b/src/compiler/FlagStd140Structs.cpp
@@ -55,11 +55,11 @@
 
     const TType &type = node->getType();
 
-    if (type.isInterfaceBlockMember() || type.getBasicType() == EbtInterfaceBlock)
+    // determine if we are in the standard layout
+    const TInterfaceBlock *interfaceBlock = type.getInterfaceBlock();
+    if (interfaceBlock)
     {
-        // determine if we are in the standard layout
-        const TType &interfaceBlockType = (type.isInterfaceBlockMember() ? *type.getInterfaceBlockType() : type);
-        return (interfaceBlockType.getLayoutQualifier().blockStorage == EbsStd140);
+        return (interfaceBlock->blockStorage() == EbsStd140);
     }
 
     return false;