commit 440dc74969b3d0e0486e639648828e24fcc0a5b2
author Jamie Madill <jmadill@transgaming.com> Thu Jun 20 11:55:55 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:05:07 2013 -0400
tree 8e9835c577bbb1d7bd47431320f97b960db9bfcb
parent 8c6befc2f976d095d39d3033379838bf79e5637d

Redesign the code that uses block layouts to use a generic base class.

The cleaner code also has the benefit of allowing us to separate the HLSL-specific parts out of the shader validator.

TRAC #23083

Signed-off-by: Nicolas Capens
Signed-off-by: Shannon Woods
Authored-by: Jamie Madill

src/compiler/OutputHLSL.cpp

diff --git a/src/compiler/OutputHLSL.cpp b/src/compiler/OutputHLSL.cpp
index 2bf96e5..450ce83 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -13,6 +13,7 @@
 #include "compiler/InfoSink.h"
 #include "compiler/SearchSymbol.h"
 #include "compiler/UnfoldShortCircuit.h"
+#include "compiler/HLSLLayoutEncoder.h"
 
 #include <algorithm>
 #include <cfloat>
@@ -284,6 +285,37 @@
     return hlsl;
 }
 
+// Use the same layout for packed and shared
+void setBlockLayout(InterfaceBlock *interfaceBlock, BlockLayoutType newLayout)
+{
+    interfaceBlock->layout = newLayout;
+    interfaceBlock->blockInfo.clear();
+
+    switch (newLayout)
+    {
+      case BLOCKLAYOUT_SHARED:
+      case BLOCKLAYOUT_PACKED:
+        {
+            HLSLBlockEncoder hlslEncoder(&interfaceBlock->blockInfo);
+            hlslEncoder.encodeFields(interfaceBlock->activeUniforms);
+            interfaceBlock->dataSize = hlslEncoder.getBlockSize();
+        }
+        break;
+
+      case BLOCKLAYOUT_STANDARD:
+        {
+            Std140BlockEncoder stdEncoder(&interfaceBlock->blockInfo);
+            stdEncoder.encodeFields(interfaceBlock->activeUniforms);
+            interfaceBlock->dataSize = stdEncoder.getBlockSize();
+        }
+        break;
+
+      default:
+        UNREACHABLE();
+        break;
+    }
+}
+
 void OutputHLSL::header()
 {
     ShShaderType shaderType = mContext.shaderType;
@@ -335,7 +367,7 @@
         mInterfaceBlockRegister += std::max(1u, interfaceBlock.arraySize);
 
         // TODO: handle other block layouts
-        interfaceBlock.setBlockLayout(BLOCKLAYOUT_SHARED);
+        setBlockLayout(&interfaceBlock, BLOCKLAYOUT_SHARED);
         mActiveInterfaceBlocks.push_back(interfaceBlock);
 
         if (interfaceBlockType.hasInstanceName())