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
parent a637e55f
...@@ -928,12 +928,20 @@ void Program::parseVaryings(const char *structure, char *hlsl, VaryingArray &var ...@@ -928,12 +928,20 @@ void Program::parseVaryings(const char *structure, char *hlsl, VaryingArray &var
char varyingType[256]; char varyingType[256];
char varyingName[256]; char varyingName[256];
unsigned int semanticIndex; unsigned int semanticIndex;
int matches = sscanf(input, " %s %s : TEXCOORD%d;", varyingType, varyingName, &semanticIndex); int matches = sscanf(input, " %s %s : TEXCOORD%d;", varyingType, varyingName, &semanticIndex);
if (matches == 3) if (matches == 3)
{ {
ASSERT(semanticIndex <= 9); // Single character ASSERT(semanticIndex <= 9); // Single character
char *array = strstr(varyingName, "[");
if (array)
{
*array = '\0';
}
varyings.push_back(Varying(varyingName, input)); varyings.push_back(Varying(varyingName, input));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment