Fix linking of struct varyings.

src/libGLESv2/DynamicHLSL.cpp

@@ -270,11 +270,20 @@ std::string DynamicHLSL::generateVaryingHLSL(FragmentShader *fragmentShader, con
 
                     std::string n = Str(varying->registerIndex + elementIndex * variableRows + row);
 
-                    // matrices within structs are not transposed, hence we do not use the special struct prefix "rm"
-                    GLenum componentType = gl::UniformComponentType(transposedType);
-                    int columnCount = gl::VariableColumnCount(transposedType);
-                    std::string componentTypeString = gl_d3d::HLSLComponentTypeString(componentType, columnCount);
-                    std::string typeString = (varying->isStruct() ? "_" + varying->structName : componentTypeString);
+                    std::string typeString;
+
+                    if (varying->isStruct())
+                    {
+                        // matrices within structs are not transposed, so
+                        // do not use the special struct prefix "rm"
+                        typeString = decorateVariable(varying->structName);
+                    }
+                    else
+                    {
+                        GLenum componentType = gl::UniformComponentType(transposedType);
+                        int columnCount = gl::VariableColumnCount(transposedType);
+                        typeString = gl_d3d::HLSLComponentTypeString(componentType, columnCount);
+                    }
                     varyingHLSL += typeString + " v" + n + " : " + varyingSemantic + n + ";\n";
                 }
             }
@@ -313,11 +322,11 @@ std::string DynamicHLSL::generateInputLayoutHLSL(const VertexFormat inputLayout[
                 structHLSL += "    " + gl_d3d::HLSLComponentTypeString(componentType, UniformComponentCount(shaderAttribute.type));
             }
 
-            structHLSL += " " + decorateAttribute(shaderAttribute.name) + " : TEXCOORD" + Str(semanticIndex) + ";\n";
+            structHLSL += " " + decorateVariable(shaderAttribute.name) + " : TEXCOORD" + Str(semanticIndex) + ";\n";
             semanticIndex += AttributeRegisterCount(shaderAttribute.type);
 
             // HLSL code for initialization
-            initHLSL += "    " + decorateAttribute(shaderAttribute.name) + " = ";
+            initHLSL += "    " + decorateVariable(shaderAttribute.name) + " = ";
 
             // Mismatched vertex attribute to vertex input may result in an undefined
             // data reinterpretation (eg for pure integer->float, float->pure integer)
@@ -329,7 +338,7 @@ std::string DynamicHLSL::generateInputLayoutHLSL(const VertexFormat inputLayout[
             }
             else
             {
-                initHLSL += "input." + decorateAttribute(shaderAttribute.name);
+                initHLSL += "input." + decorateVariable(shaderAttribute.name);
             }
 
             initHLSL += ";\n";
@@ -926,7 +935,7 @@ std::string DynamicHLSL::generatePointSpriteHLSL(int registers, const sh::Shader
 }
 
 // This method needs to match OutputHLSL::decorate
-std::string DynamicHLSL::decorateAttribute(const std::string &name)
+std::string DynamicHLSL::decorateVariable(const std::string &name)
 {
     if (name.compare(0, 3, "gl_") != 0 && name.compare(0, 3, "dx_") != 0)
     {
@@ -938,7 +947,7 @@ std::string DynamicHLSL::decorateAttribute(const std::string &name)
 
 std::string DynamicHLSL::generateAttributeConversionHLSL(const VertexFormat &vertexFormat, const sh::ShaderVariable &shaderAttrib) const
 {
-    std::string attribString = "input." + decorateAttribute(shaderAttrib.name);
+    std::string attribString = "input." + decorateVariable(shaderAttrib.name);
 
     // Matrix
     if (IsMatrixType(shaderAttrib.type))

src/libGLESv2/DynamicHLSL.h

@@ -58,7 +58,7 @@ class DynamicHLSL
     std::string generatePointSpriteHLSL(int registers, const sh::ShaderVariable *packing[][4], FragmentShader *fragmentShader, VertexShader *vertexShader) const;
 
     // Prepend an underscore
-    static std::string decorateAttribute(const std::string &name);
+    static std::string decorateVariable(const std::string &name);
 
     std::string generateAttributeConversionHLSL(const VertexFormat &vertexFormat, const sh::ShaderVariable &shaderAttrib) const;
 };