summaryrefslogtreecommitdiff
path: root/dist/Mesa/src/mesa/shader/arbprogram_syn.h
diff options
context:
space:
mode:
Diffstat (limited to 'dist/Mesa/src/mesa/shader/arbprogram_syn.h')
-rw-r--r--dist/Mesa/src/mesa/shader/arbprogram_syn.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/dist/Mesa/src/mesa/shader/arbprogram_syn.h b/dist/Mesa/src/mesa/shader/arbprogram_syn.h
index c67afc67d..106fa5b00 100644
--- a/dist/Mesa/src/mesa/shader/arbprogram_syn.h
+++ b/dist/Mesa/src/mesa/shader/arbprogram_syn.h
@@ -905,6 +905,8 @@
"stateTexEnvProperty\n"
" \"color\" .emit TEX_ENV_COLOR;\n"
"optLegacyTexUnitNum\n"
+" optLegacyTexUnitNum_1 .or .true .emit 0x00;\n"
+"optLegacyTexUnitNum_1\n"
" lbracket_ne .and legacyTexUnitNum .and rbracket;\n"
"legacyTexUnitNum\n"
" integer;\n"
@@ -1221,11 +1223,11 @@
"white_char\n"
" ' ' .or '\\t' .or '\\n' .or '\\r';\n"
"comment_block\n"
-" '#' .and .loop comment_char .and new_line;\n"
+" '#' .and .loop comment_char .and optional_new_line;\n"
"comment_char\n"
" '\\x0E'-'\\xFF' .or '\\x01'-'\\x09' .or '\\x0B'-'\\x0C';\n"
-"new_line\n"
-" '\\n' .or crlf .or '\\0';\n"
+"optional_new_line\n"
+" '\\n' .or crlf .or .true;\n"
"crlf\n"
" '\\r' .and '\\n';\n"
"semicolon\n"