35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From c13584c7783cd34ffff7da088dd7b6bdc51de093 Mon Sep 17 00:00:00 2001
|
|
From: rajdakin <loic_chevalier@yahoo.fr>
|
|
Date: Mon, 12 Oct 2020 18:51:36 +0200
|
|
Subject: [PATCH 037/233] [ARB] Fixed two errors
|
|
|
|
---
|
|
src/gl/arbparser.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/gl/arbparser.c b/src/gl/arbparser.c
|
|
index dc0040f7..240b0565 100755
|
|
--- a/src/gl/arbparser.c
|
|
+++ b/src/gl/arbparser.c
|
|
@@ -2679,7 +2679,8 @@ void parseToken(sCurStatus* curStatusPtr, int vertex, char **error_msg, int *has
|
|
curStatusPtr->curValue.newVar.state = 4;
|
|
break;
|
|
case TOK_RBRACE:
|
|
- if ((curStatusPtr->curValue.newVar.state != 5) && (curStatusPtr->curValue.newVar.state != 11)) {
|
|
+ if ((curStatusPtr->curValue.newVar.state != 5) && (curStatusPtr->curValue.newVar.state != 7)
|
|
+ && (curStatusPtr->curValue.newVar.state != 9) && (curStatusPtr->curValue.newVar.state != 11)) {
|
|
FAIL("Invalid state");
|
|
}
|
|
|
|
@@ -3561,6 +3562,7 @@ void parseToken(sCurStatus* curStatusPtr, int vertex, char **error_msg, int *has
|
|
/* FALLTHROUGH */
|
|
case STATE_AFTER_VALID:
|
|
case STATE_AFTER_VALID_RSQBR:
|
|
+ case STATE_AFTER_NUMBER:
|
|
case STATE_AFTER_SWIZZLE:
|
|
if (curStatusPtr->curToken == TOK_COMMA) {
|
|
curStatusPtr->curValue.newInst.state = STATE_START;
|
|
--
|
|
2.11.0
|
|
|