tgsi: fix property parsing/building

This commit is contained in:
Zack Rusin 2009-12-23 14:39:16 -05:00
parent e9c6f01a52
commit 960be012a9
2 changed files with 7 additions and 5 deletions

View File

@ -1025,7 +1025,7 @@ tgsi_build_full_property(
size++;
*property = tgsi_build_property(
TGSI_PROPERTY_GS_INPUT_PRIM,
full_prop->Property.PropertyName,
header );
assert( full_prop->Property.NrTokens <= 8 + 1 );

View File

@ -62,18 +62,20 @@ static boolean uprcase( char c )
}
/*
* Ignore case of str1 and assume str2 is already uppercase.
* Ignore case of str1 and assume str1 is already uppercase.
* Return TRUE iff str1 and str2 are equal.
*/
static int
streq_nocase_uprcase(const char *str1,
const char *str2)
{
while (*str1 && uprcase(*str1) == *str2) {
while (*str1 && *str2) {
if (*str1 != uprcase(*str2))
return FALSE;
str1++;
str2++;
}
return *str1 == *str2;
return TRUE;
}
static boolean str_match_no_case( const char **pcur, const char *str )
@ -1166,7 +1168,7 @@ static boolean parse_property( struct translate_ctx *ctx )
}
for (property_name = 0; property_name < TGSI_PROPERTY_COUNT;
++property_name) {
if (streq_nocase_uprcase(id, property_names[property_name])) {
if (streq_nocase_uprcase(property_names[property_name], id)) {
break;
}
}