HLSL: Fix handling arrays of structs in interface blocks
In HLSL output, structs in interface blocks are not accessed directly.
Rather they get copied from the D3D constant buffer to static structs
in the shader header. Fix generating the copy/init code in the header
to handle arrays of structs correctly.
BUG=angleproject:2084
TEST=angle_end2end_tests
Change-Id: If66bd5be3f3570ba591b8b62c5284c06fc83dd45
Reviewed-on: https://chromium-review.googlesource.com/608448
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>
diff --git a/src/compiler/translator/OutputHLSL.cpp b/src/compiler/translator/OutputHLSL.cpp
index f708c0a..2d43024 100644
--- a/src/compiler/translator/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
@@ -249,45 +249,58 @@
return elementSize * arraySize;
}
-TString OutputHLSL::structInitializerString(int indent,
- const TStructure &structure,
- const TString &rhsStructName)
+TString OutputHLSL::structInitializerString(int indent, const TType &type, const TString &name)
{
TString init;
- TString preIndentString;
- TString fullIndentString;
-
- for (int spaces = 0; spaces < (indent * 4); spaces++)
+ TString indentString;
+ for (int spaces = 0; spaces < indent; spaces++)
{
- preIndentString += ' ';
+ indentString += " ";
}
- for (int spaces = 0; spaces < ((indent + 1) * 4); spaces++)
+ if (type.isArray())
{
- fullIndentString += ' ';
- }
-
- init += preIndentString + "{\n";
-
- const TFieldList &fields = structure.fields();
- for (unsigned int fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++)
- {
- const TField &field = *fields[fieldIndex];
- const TString &fieldName = rhsStructName + "." + Decorate(field.name());
- const TType &fieldType = *field.type();
-
- if (fieldType.getStruct())
+ init += indentString + "{\n";
+ for (unsigned int arrayIndex = 0u; arrayIndex < type.getArraySize(); ++arrayIndex)
{
- init += structInitializerString(indent + 1, *fieldType.getStruct(), fieldName);
+ TStringStream indexedString;
+ indexedString << name << "[" << arrayIndex << "]";
+ TType elementType = type;
+ elementType.clearArrayness();
+ init += structInitializerString(indent + 1, elementType, indexedString.str());
+ if (arrayIndex < type.getArraySize() - 1)
+ {
+ init += ",";
+ }
+ init += "\n";
}
- else
- {
- init += fullIndentString + fieldName + ",\n";
- }
+ init += indentString + "}";
}
+ else if (type.getBasicType() == EbtStruct)
+ {
+ init += indentString + "{\n";
+ const TStructure &structure = *type.getStruct();
+ const TFieldList &fields = structure.fields();
+ for (unsigned int fieldIndex = 0; fieldIndex < fields.size(); fieldIndex++)
+ {
+ const TField &field = *fields[fieldIndex];
+ const TString &fieldName = name + "." + Decorate(field.name());
+ const TType &fieldType = *field.type();
- init += preIndentString + "}" + (indent == 0 ? ";" : ",") + "\n";
+ init += structInitializerString(indent + 1, fieldType, fieldName);
+ if (fieldIndex < fields.size() - 1)
+ {
+ init += ",";
+ }
+ init += "\n";
+ }
+ init += indentString + "}";
+ }
+ else
+ {
+ init += indentString + name;
+ }
return init;
}
@@ -307,9 +320,14 @@
const TStructure &structure = *structNode->getType().getStruct();
const TString &originalName = mFlaggedStructOriginalNames[structNode];
- flaggedStructs += "static " + Decorate(structure.name()) + " " + mappedName + " =\n";
- flaggedStructs += structInitializerString(0, structure, originalName);
- flaggedStructs += "\n";
+ flaggedStructs += "static " + Decorate(structure.name()) + " " + mappedName;
+ if (structNode->isArray())
+ {
+ flaggedStructs += ArrayString(structNode->getType());
+ }
+ flaggedStructs += " =\n";
+ flaggedStructs += structInitializerString(0, structNode->getType(), originalName);
+ flaggedStructs += ";\n";
}
for (ReferencedSymbols::const_iterator varying = mReferencedVaryings.begin();