diff options
| author | Karl Rasche <karlrasche@gmail.com> | 2003-11-25 02:08:05 +0000 |
|---|---|---|
| committer | Karl Rasche <karlrasche@gmail.com> | 2003-11-25 02:08:05 +0000 |
| commit | e749be22b03312c3927964c85d589868e3292977 (patch) | |
| tree | c85be2997ebd8046467be9ac8bc53cb35ad53082 /src/mesa/main/arbparse_syn.h | |
| parent | 9bc3753a513f2045f3613389c2ddb604df8693e7 (diff) | |
- New version of the syntax rules from Michal Krol
+ Handles '1' as a float, just like '1.'
+ Remove switch collision between vp and fp #defines
+ result.color.xyz no longer requires result.color.primary.xyz
Diffstat (limited to 'src/mesa/main/arbparse_syn.h')
| -rw-r--r-- | src/mesa/main/arbparse_syn.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/mesa/main/arbparse_syn.h b/src/mesa/main/arbparse_syn.h index b6a05d7b40..e1b7731630 100644 --- a/src/mesa/main/arbparse_syn.h +++ b/src/mesa/main/arbparse_syn.h @@ -1,5 +1,5 @@ static char arb_grammar_text[] = ".syntax program;\n" -".emtcode REVISION 0x03\n" +".emtcode REVISION 0x04\n" ".emtcode FRAGMENT_PROGRAM 0x01\n" ".emtcode VERTEX_PROGRAM 0x02\n" ".emtcode OPTION 0x01\n" @@ -11,7 +11,7 @@ static char arb_grammar_text[] = ".syntax program;\n" ".emtcode ARB_FOG_EXP 0x04\n" ".emtcode ARB_FOG_EXP2 0x08\n" ".emtcode ARB_FOG_LINEAR 0x10\n" -".emtcode ARB_POSITION_INVARIANT 0x01\n" +".emtcode ARB_POSITION_INVARIANT 0x20\n" ".emtcode F_ALU_INST 0x01\n" ".emtcode F_TEX_INST 0x02\n" ".emtcode F_ALU_VECTOR 0x01\n" @@ -189,9 +189,9 @@ static char arb_grammar_text[] = ".syntax program;\n" ".emtcode STATE_MATRIX_ROWS 0x06\n" ".emtcode STATE_TEX_ENV 0x07\n" ".emtcode STATE_DEPTH 0x08\n" -".emtcode STATE_TEX_GEN 0x07\n" -".emtcode STATE_CLIP_PLANE 0x08\n" -".emtcode STATE_POINT 0x09\n" +".emtcode STATE_TEX_GEN 0x09\n" +".emtcode STATE_CLIP_PLANE 0x0A\n" +".emtcode STATE_POINT 0x0B\n" ".emtcode MATERIAL_AMBIENT 0x01\n" ".emtcode MATERIAL_DIFFUSE 0x02\n" ".emtcode MATERIAL_SPECULAR 0x03\n" @@ -1054,7 +1054,7 @@ static char arb_grammar_text[] = ".syntax program;\n" "optColorType\n" " ColorType .or .true .emit COLOR_PRIMARY;\n" "ColorType\n" -" dot_ne .and ColorProperty .error INVALID_COLOR_PROPERTY;\n" +" dot_ne .and ColorProperty;\n" "ColorProperty\n" " \"primary\" .emit COLOR_PRIMARY .or \"secondary\" .emit COLOR_SECONDARY;\n" "fp_ALIAS_statement\n" @@ -1151,17 +1151,19 @@ static char arb_grammar_text[] = ".syntax program;\n" "dotdot_ne\n" " optional_space .and '.' .and '.' .and optional_space;\n" "float\n" -" float_1 .or float_2;\n" +" float_1 .or float_2 .or float_legacy;\n" "float_1\n" " '.' .emit 0x00 .and integer_ne .error MISSING_FRACTION_OR_EXPONENT .and optional_exponent;\n" "float_2\n" -" integer_ne .and float_3 .error MISSING_DOT_OR_EXPONENT;\n" +" integer_ne .and float_3;\n" "float_3\n" " float_4 .or float_5;\n" "float_4\n" " '.' .and optional_integer .and optional_exponent;\n" "float_5\n" " exponent .emit 0x00;\n" +"float_legacy\n" +" integer_ne .and .true .emit 0x00 .emit '1' .emit 0x00 .emit $;\n" "integer_ne\n" " integer_ne_1 .and .true .emit 0x00 .emit $;\n" "integer_ne_1\n" |