Declare structures before uniform definitions and support varying arrays

TRAC #11809 Signed-off-by: Andrew Lewycky Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@217 736b8ea6-26fd-11df-bfd4-992fa37f6226

Declare structures before uniform definitions and support varying arrays
51d0dc2a · daniel@transgaming.com · a637e55f · 51d0dc2a · 51d0dc2a
Commit 51d0dc2a authored Apr 29, 2010 by daniel@transgaming.com
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

OutputHLSL.cpp src/compiler/OutputHLSL.cpp +0 -0

Program.cpp src/libGLESv2/Program.cpp +8 -0

No files found.
--- a/src/compiler/OutputHLSL.cpp
+++ b/src/compiler/OutputHLSL.cpp
--- a/src/libGLESv2/Program.cpp
+++ b/src/libGLESv2/Program.cpp
@@ -928,12 +928,20 @@ void Program::parseVaryings(const char *structure, char *hlsl, VaryingArray &var
        char varyingType[256];
        char varyingName[256];
        unsigned int semanticIndex;
+
        int matches = sscanf(input, "    %s %s : TEXCOORD%d;", varyingType, varyingName, &semanticIndex);

        if (matches == 3)
        {
            ASSERT(semanticIndex <= 9);   // Single character

+            char *array = strstr(varyingName, "[");
+
+            if (array)
+            {
+                *array = '\0';
+            }
+
            varyings.push_back(Varying(varyingName, input));
        }