diff options
| author | Ian Romanick <[email protected]> | 2009-09-10 15:33:45 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2009-09-10 15:33:45 -0700 |
| commit | b8e1e8d2d8ae6ffbf8f271b46ee89788a926b3b0 (patch) | |
| tree | 5db502ab80287bfc8ff61082784017c7448464f5 /src/mesa/shader/program_parse.tab.h | |
| parent | 81722c5d7e8e93d837510b9e6e5d014ec64cf4b3 (diff) | |
| parent | d9dc4cb0e4f578da9e50c9d1ba6fd9c22ea2fca6 (diff) | |
Merge branch 'master' into asm-shader-rework-2
Conflicts:
src/mesa/shader/lex.yy.c
src/mesa/shader/program_parse.tab.c
src/mesa/shader/program_parse.tab.h
Diffstat (limited to 'src/mesa/shader/program_parse.tab.h')
| -rw-r--r-- | src/mesa/shader/program_parse.tab.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/shader/program_parse.tab.h b/src/mesa/shader/program_parse.tab.h index c6ed6c777ea..860b6f886e9 100644 --- a/src/mesa/shader/program_parse.tab.h +++ b/src/mesa/shader/program_parse.tab.h @@ -94,7 +94,7 @@ PALETTE = 310, PARAMS = 311, PLANE = 312, - POINT = 313, + POINT_TOK = 313, POINTSIZE = 314, POSITION = 315, PRIMARY = 316, @@ -106,7 +106,7 @@ SCENECOLOR = 322, SECONDARY = 323, SHININESS = 324, - SIZE = 325, + SIZE_TOK = 325, SPECULAR = 326, SPOT = 327, STATE = 328, @@ -168,7 +168,7 @@ typedef union YYSTYPE unsigned attrib; int integer; float real; - unsigned state[5]; + gl_state_index state[STATE_LENGTH]; int negate; struct asm_vector vector; gl_inst_opcode opcode; |