ES31: Simplify IsInShaderStorageBlock function

src/compiler/translator/util.cpp

@@ -753,30 +753,28 @@ bool IsOutputVulkan(ShShaderOutput output)
 
 bool IsInShaderStorageBlock(TIntermTyped *node)
 {
-    TIntermBinary *binaryNode   = nullptr;
     TIntermSwizzle *swizzleNode = node->getAsSwizzleNode();
     if (swizzleNode)
     {
-        binaryNode = swizzleNode->getOperand()->getAsBinaryNode();
-        if (binaryNode)
-        {
-            return IsInShaderStorageBlock(binaryNode->getLeft());
-        }
-        TIntermSymbol *symbolNode = swizzleNode->getOperand()->getAsSymbolNode();
-        if (symbolNode)
-        {
-            return symbolNode->getQualifier() == EvqBuffer;
-        }
+        return IsInShaderStorageBlock(swizzleNode->getOperand());
     }
-    binaryNode = node->getAsBinaryNode();
 
+    TIntermBinary *binaryNode = node->getAsBinaryNode();
     if (binaryNode)
     {
-        return IsInShaderStorageBlock(binaryNode->getLeft());
+        switch (binaryNode->getOp())
+        {
+            case EOpIndexDirectInterfaceBlock:
+            case EOpIndexIndirect:
+            case EOpIndexDirect:
+            case EOpIndexDirectStruct:
+                return IsInShaderStorageBlock(binaryNode->getLeft());
+            default:
+                return false;
+        }
     }
 
     const TType &type = node->getType();
-
     return type.getQualifier() == EvqBuffer;
 }