commit b4e664b129775c5568875b6bef4f0579b1220179
author Jamie Madill <jmadill@transgaming.com> Thu Jun 20 11:55:54 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:05:06 2013 -0400
tree 246d9a35c5aca05403f0c5be0439fbdb3fa75b94
parent 529077d9c753ebe3e5f02bae83be78f279ff410a

Alter array instanced uniform buffer objects to use direct references to HLSL constant buffers.

This avoids using a shader scoped static storage buffer, with copies.

TRAC #23299

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 f183ab5..2bf96e5 100644
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
@@ -291,7 +291,6 @@
 
     TString uniforms;
     TString interfaceBlocks;
-    TString interfaceBlockInit;
     TString varyings;
     TString attributes;
 
@@ -346,16 +345,9 @@
 
         if (arraySize > 0)
         {
-            interfaceBlocks += "static " + interfaceBlockStructName(interfaceBlockType) + " " + decorate(interfaceBlockType.getInstanceName()) +
-                               arrayString(interfaceBlockType) + ";\n\n";
-
             for (unsigned int arrayIndex = 0; arrayIndex < arraySize; arrayIndex++)
             {
                 interfaceBlocks += interfaceBlockString(interfaceBlockType, interfaceBlock.registerIndex + arrayIndex, arrayIndex);
-
-                const TString &instanceName = interfaceBlockType.getInstanceName();
-                interfaceBlockInit += "   " + decorate(instanceName) + "[" + str(arrayIndex) + "] = " +
-                                      interfaceBlockInstanceString(interfaceBlockType, arrayIndex) + ";\n";
             }
         }
         else
@@ -364,14 +356,6 @@
         }
     }
 
-    if (!interfaceBlockInit.empty())
-    {
-        interfaceBlocks += "void dx_initConstantBuffers()\n"
-                           "{\n" +
-                           interfaceBlockInit +
-                           "}\n\n";
-    }
-
     for (ReferencedSymbols::const_iterator varying = mReferencedVaryings.begin(); varying != mReferencedVaryings.end(); varying++)
     {
         const TType &type = varying->second->getType();
@@ -1566,8 +1550,27 @@
         }
         break;
       case EOpDivAssign:               outputTriplet(visit, "(", " /= ", ")");          break;
-      case EOpIndexDirect:             outputTriplet(visit, "", "[", "]");              break;
-      case EOpIndexIndirect:           outputTriplet(visit, "", "[", "]");              break;
+      case EOpIndexDirect:
+        if (node->getLeft()->getBasicType() == EbtInterfaceBlock)
+        {
+            if (visit == PreVisit)
+            {
+                const TType &interfaceBlockType = node->getLeft()->getType();
+                mReferencedInterfaceBlocks[interfaceBlockType.getInstanceName()] = node->getLeft()->getAsSymbolNode();
+                out << interfaceBlockInstanceString(interfaceBlockType, node->getRight()->getAsConstantUnion()->getIConst(0));
+                return false;
+            }
+        }
+        else
+        {
+            outputTriplet(visit, "", "[", "]");
+        }
+        break;
+      case EOpIndexIndirect:
+        // We do not currently support indirect references to interface blocks
+        ASSERT(node->getLeft()->getBasicType() != EbtInterfaceBlock);
+        outputTriplet(visit, "", "[", "]");
+        break;
       case EOpIndexDirectStruct:
       case EOpIndexDirectInterfaceBlock:
         if (visit == InVisit)