translator: Refactor interface block layout qualifiers.

This will make it easier to insert internal uniform layouts in Vulkan. Bug: angleproject:2717 Change-Id: Ic1a76848337cc67a57698913c584d8596bf4f27e Reviewed-on: https://chromium-review.googlesource.com/1127300Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Luc Ferron <lucferron@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

translator: Refactor interface block layout qualifiers.
b7c4f2b9 · Jamie Madill · Commit Bot · 6ed6c71c · b7c4f2b9
Commit b7c4f2b9 authored Jul 09, 2018 by Jamie Madill Committed by Commit Bot Jul 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

OutputGLSLBase.cpp src/compiler/translator/OutputGLSLBase.cpp +8 -6

No files found.
--- a/src/compiler/translator/OutputGLSLBase.cpp
+++ b/src/compiler/translator/OutputGLSLBase.cpp
@@ -165,6 +165,13 @@ void TOutputGLSLBase::writeLayoutQualifier(TIntermTyped *variable)
        return;
    }
+    if (type.getBasicType() == EbtInterfaceBlock)
+    {
+        const TInterfaceBlock *interfaceBlock = type.getInterfaceBlock();
+        declareInterfaceBlockLayout(interfaceBlock);
+        return;
+    }
    TInfoSinkBase &out                      = objSink();
    const TLayoutQualifier &layoutQualifier = type.getLayoutQualifier();
    out << "layout(";
@@ -267,11 +274,6 @@ void TOutputGLSLBase::writeVariableType(const TType &type, const TSymbol *symbol
    {
        writeInvariantQualifier(type);
    }
-    if (type.getBasicType() == EbtInterfaceBlock)
-    {
-        const TInterfaceBlock *interfaceBlock = type.getInterfaceBlock();
-        declareInterfaceBlockLayout(interfaceBlock);
-    }
    if (qualifier != EvqTemporary && qualifier != EvqGlobal)
    {
        writeQualifier(qualifier, symbol);
@@ -1316,7 +1318,7 @@ bool NeedsToWriteLayoutQualifier(const TType &type)
 {
    if (type.getBasicType() == EbtInterfaceBlock)
    {
-        return false;
+        return true;
    }
    const TLayoutQualifier &layoutQualifier = type.getLayoutQualifier();