ARB prog: replace 'unsigned' with 'gl_state_index'

Fixes compilation warnings with MSVC.

5 files changed, 195 insertions, 195 deletions

diff --git a/src/mesa/shader/lex.yy.c b/src/mesa/shader/lex.yy.c
index 2ff2a4f5a3e..709426f3a63 100644
--- a/src/mesa/shader/lex.yy.c
+++ b/src/mesa/shader/lex.yy.c
@@ -901,6 +901,7 @@ static yyconst flex_int16_t yy_chk[1023] =
  */
 #include "main/glheader.h"
 #include "prog_instruction.h"
+#include "prog_statevars.h"
 
 #include "program_parser.h"
 #include "program_parse.tab.h"
@@ -1002,7 +1003,7 @@ swiz_from_char(char c)
    } while(0);
 
 #define YY_EXTRA_TYPE struct asm_parser_state *
-#line 1006 "lex.yy.c"
+#line 1007 "lex.yy.c"
 
 #define INITIAL 0
 
@@ -1243,10 +1244,10 @@ YY_DECL
 	register int yy_act;
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 
-#line 135 "program_lexer.l"
+#line 136 "program_lexer.l"
 
 
-#line 1250 "lex.yy.c"
+#line 1251 "lex.yy.c"
 
     yylval = yylval_param;
 
@@ -1335,17 +1336,17 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 YY_RULE_SETUP
-#line 137 "program_lexer.l"
+#line 138 "program_lexer.l"
 { return ARBvp_10; }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 138 "program_lexer.l"
+#line 139 "program_lexer.l"
 { return ARBfp_10; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 139 "program_lexer.l"
+#line 140 "program_lexer.l"
 {
    yylval->integer = at_address;
    return_token_or_IDENTIFIER(require_ARB_vp, ADDRESS);
@@ -1353,747 +1354,747 @@ YY_RULE_SETUP
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 143 "program_lexer.l"
+#line 144 "program_lexer.l"
 { return ALIAS; }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 144 "program_lexer.l"
+#line 145 "program_lexer.l"
 { return ATTRIB; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 145 "program_lexer.l"
+#line 146 "program_lexer.l"
 { return END; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 146 "program_lexer.l"
+#line 147 "program_lexer.l"
 { return OPTION; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 147 "program_lexer.l"
+#line 148 "program_lexer.l"
 { return OUTPUT; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 148 "program_lexer.l"
+#line 149 "program_lexer.l"
 { return PARAM; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 149 "program_lexer.l"
+#line 150 "program_lexer.l"
 { yylval->integer = at_temp; return TEMP; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 151 "program_lexer.l"
+#line 152 "program_lexer.l"
 { return_opcode(             1, VECTOR_OP, ABS, OFF); }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 152 "program_lexer.l"
+#line 153 "program_lexer.l"
 { return_opcode(require_ARB_fp, VECTOR_OP, ABS, ZERO_ONE); }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 153 "program_lexer.l"
+#line 154 "program_lexer.l"
 { return_opcode(             1, BIN_OP, ADD, OFF); }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 154 "program_lexer.l"
+#line 155 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, ADD, ZERO_ONE); }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 155 "program_lexer.l"
+#line 156 "program_lexer.l"
 { return_opcode(require_ARB_vp, ARL, ARL, OFF); }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 157 "program_lexer.l"
+#line 158 "program_lexer.l"
 { return_opcode(require_ARB_fp, TRI_OP, CMP, OFF); }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 158 "program_lexer.l"
+#line 159 "program_lexer.l"
 { return_opcode(require_ARB_fp, TRI_OP, CMP, ZERO_ONE); }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 159 "program_lexer.l"
+#line 160 "program_lexer.l"
 { return_opcode(require_ARB_fp, SCALAR_OP, COS, OFF); }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 160 "program_lexer.l"
+#line 161 "program_lexer.l"
 { return_opcode(require_ARB_fp, SCALAR_OP, COS, ZERO_ONE); }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 162 "program_lexer.l"
+#line 163 "program_lexer.l"
 { return_opcode(             1, BIN_OP, DP3, OFF); }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 163 "program_lexer.l"
+#line 164 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, DP3, ZERO_ONE); }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 164 "program_lexer.l"
+#line 165 "program_lexer.l"
 { return_opcode(             1, BIN_OP, DP4, OFF); }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 165 "program_lexer.l"
+#line 166 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, DP4, ZERO_ONE); }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 166 "program_lexer.l"
+#line 167 "program_lexer.l"
 { return_opcode(             1, BIN_OP, DPH, OFF); }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 167 "program_lexer.l"
+#line 168 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, DPH, ZERO_ONE); }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 168 "program_lexer.l"
+#line 169 "program_lexer.l"
 { return_opcode(             1, BIN_OP, DST, OFF); }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 169 "program_lexer.l"
+#line 170 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, DST, ZERO_ONE); }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 171 "program_lexer.l"
+#line 172 "program_lexer.l"
 { return_opcode(             1, SCALAR_OP, EX2, OFF); }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 172 "program_lexer.l"
+#line 173 "program_lexer.l"
 { return_opcode(require_ARB_fp, SCALAR_OP, EX2, ZERO_ONE); }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 173 "program_lexer.l"
+#line 174 "program_lexer.l"
 { return_opcode(require_ARB_vp, SCALAR_OP, EXP, OFF); }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 175 "program_lexer.l"
+#line 176 "program_lexer.l"
 { return_opcode(             1, VECTOR_OP, FLR, OFF); }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 176 "program_lexer.l"
+#line 177 "program_lexer.l"
 { return_opcode(require_ARB_fp, VECTOR_OP, FLR, ZERO_ONE); }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 177 "program_lexer.l"
+#line 178 "program_lexer.l"
 { return_opcode(             1, VECTOR_OP, FRC, OFF); }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 178 "program_lexer.l"
+#line 179 "program_lexer.l"
 { return_opcode(require_ARB_fp, VECTOR_OP, FRC, ZERO_ONE); }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 180 "program_lexer.l"
+#line 181 "program_lexer.l"
 { return_opcode(require_ARB_fp, KIL, KIL, OFF); }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 182 "program_lexer.l"
+#line 183 "program_lexer.l"
 { return_opcode(             1, VECTOR_OP, LIT, OFF); }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 183 "program_lexer.l"
+#line 184 "program_lexer.l"
 { return_opcode(require_ARB_fp, VECTOR_OP, LIT, ZERO_ONE); }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 184 "program_lexer.l"
+#line 185 "program_lexer.l"
 { return_opcode(             1, SCALAR_OP, LG2, OFF); }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 185 "program_lexer.l"
+#line 186 "program_lexer.l"
 { return_opcode(require_ARB_fp, SCALAR_OP, LG2, ZERO_ONE); }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 186 "program_lexer.l"
+#line 187 "program_lexer.l"
 { return_opcode(require_ARB_vp, SCALAR_OP, LOG, OFF); }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 187 "program_lexer.l"
+#line 188 "program_lexer.l"
 { return_opcode(require_ARB_fp, TRI_OP, LRP, OFF); }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 188 "program_lexer.l"
+#line 189 "program_lexer.l"
 { return_opcode(require_ARB_fp, TRI_OP, LRP, ZERO_ONE); }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 190 "program_lexer.l"
+#line 191 "program_lexer.l"
 { return_opcode(             1, TRI_OP, MAD, OFF); }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 191 "program_lexer.l"
+#line 192 "program_lexer.l"
 { return_opcode(require_ARB_fp, TRI_OP, MAD, ZERO_ONE); }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 192 "program_lexer.l"
+#line 193 "program_lexer.l"
 { return_opcode(             1, BIN_OP, MAX, OFF); }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 193 "program_lexer.l"
+#line 194 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, MAX, ZERO_ONE); }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 194 "program_lexer.l"
+#line 195 "program_lexer.l"
 { return_opcode(             1, BIN_OP, MIN, OFF); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 195 "program_lexer.l"
+#line 196 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, MIN, ZERO_ONE); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 196 "program_lexer.l"
+#line 197 "program_lexer.l"
 { return_opcode(             1, VECTOR_OP, MOV, OFF); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 197 "program_lexer.l"
+#line 198 "program_lexer.l"
 { return_opcode(require_ARB_fp, VECTOR_OP, MOV, ZERO_ONE); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 198 "program_lexer.l"
+#line 199 "program_lexer.l"
 { return_opcode(             1, BIN_OP, MUL, OFF); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 199 "program_lexer.l"
+#line 200 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, MUL, ZERO_ONE); }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 201 "program_lexer.l"
+#line 202 "program_lexer.l"
 { return_opcode(             1, BINSC_OP, POW, OFF); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 202 "program_lexer.l"
+#line 203 "program_lexer.l"
 { return_opcode(require_ARB_fp, BINSC_OP, POW, ZERO_ONE); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 204 "program_lexer.l"
+#line 205 "program_lexer.l"
 { return_opcode(             1, SCALAR_OP, RCP, OFF); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 205 "program_lexer.l"
+#line 206 "program_lexer.l"
 { return_opcode(require_ARB_fp, SCALAR_OP, RCP, ZERO_ONE); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 206 "program_lexer.l"
+#line 207 "program_lexer.l"
 { return_opcode(             1, SCALAR_OP, RSQ, OFF); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 207 "program_lexer.l"
+#line 208 "program_lexer.l"
 { return_opcode(require_ARB_fp, SCALAR_OP, RSQ, ZERO_ONE); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 209 "program_lexer.l"
+#line 210 "program_lexer.l"
 { return_opcode(require_ARB_fp, SCALAR_OP, SCS, OFF); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 210 "program_lexer.l"
+#line 211 "program_lexer.l"
 { return_opcode(require_ARB_fp, SCALAR_OP, SCS, ZERO_ONE); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 211 "program_lexer.l"
+#line 212 "program_lexer.l"
 { return_opcode(             1, BIN_OP, SGE, OFF); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 212 "program_lexer.l"
+#line 213 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, SGE, ZERO_ONE); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 213 "program_lexer.l"
+#line 214 "program_lexer.l"
 { return_opcode(require_ARB_fp, SCALAR_OP, SIN, OFF); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 214 "program_lexer.l"
+#line 215 "program_lexer.l"
 { return_opcode(require_ARB_fp, SCALAR_OP, SIN, ZERO_ONE); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 215 "program_lexer.l"
+#line 216 "program_lexer.l"
 { return_opcode(             1, BIN_OP, SLT, OFF); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 216 "program_lexer.l"
+#line 217 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, SLT, ZERO_ONE); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 217 "program_lexer.l"
+#line 218 "program_lexer.l"
 { return_opcode(             1, BIN_OP, SUB, OFF); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 218 "program_lexer.l"
+#line 219 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, SUB, ZERO_ONE); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 219 "program_lexer.l"
+#line 220 "program_lexer.l"
 { return_opcode(             1, SWZ, SWZ, OFF); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 220 "program_lexer.l"
+#line 221 "program_lexer.l"
 { return_opcode(require_ARB_fp, SWZ, SWZ, ZERO_ONE); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 222 "program_lexer.l"
+#line 223 "program_lexer.l"
 { return_opcode(require_ARB_fp, SAMPLE_OP, TEX, OFF); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 223 "program_lexer.l"
+#line 224 "program_lexer.l"
 { return_opcode(require_ARB_fp, SAMPLE_OP, TEX, ZERO_ONE); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 224 "program_lexer.l"
+#line 225 "program_lexer.l"
 { return_opcode(require_ARB_fp, SAMPLE_OP, TXB, OFF); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 225 "program_lexer.l"
+#line 226 "program_lexer.l"
 { return_opcode(require_ARB_fp, SAMPLE_OP, TXB, ZERO_ONE); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 226 "program_lexer.l"
+#line 227 "program_lexer.l"
 { return_opcode(require_ARB_fp, SAMPLE_OP, TXP, OFF); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 227 "program_lexer.l"
+#line 228 "program_lexer.l"
 { return_opcode(require_ARB_fp, SAMPLE_OP, TXP, ZERO_ONE); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 229 "program_lexer.l"
+#line 230 "program_lexer.l"
 { return_opcode(             1, BIN_OP, XPD, OFF); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 230 "program_lexer.l"
+#line 231 "program_lexer.l"
 { return_opcode(require_ARB_fp, BIN_OP, XPD, ZERO_ONE); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 232 "program_lexer.l"
+#line 233 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 233 "program_lexer.l"
+#line 234 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 234 "program_lexer.l"
+#line 235 "program_lexer.l"
 { return PROGRAM; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 235 "program_lexer.l"
+#line 236 "program_lexer.l"
 { return STATE; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 236 "program_lexer.l"
+#line 237 "program_lexer.l"
 { return RESULT; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 238 "program_lexer.l"
+#line 239 "program_lexer.l"
 { return AMBIENT; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 239 "program_lexer.l"
+#line 240 "program_lexer.l"
 { return ATTENUATION; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 240 "program_lexer.l"
+#line 241 "program_lexer.l"
 { return BACK; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 241 "program_lexer.l"
+#line 242 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, CLIP); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 242 "program_lexer.l"
+#line 243 "program_lexer.l"
 { return COLOR; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 243 "program_lexer.l"
+#line 244 "program_lexer.l"
 { return_token_or_DOT(require_ARB_fp, DEPTH); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 244 "program_lexer.l"
+#line 245 "program_lexer.l"
 { return DIFFUSE; }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 245 "program_lexer.l"
+#line 246 "program_lexer.l"
 { return DIRECTION; }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 246 "program_lexer.l"
+#line 247 "program_lexer.l"
 { return EMISSION; }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 247 "program_lexer.l"
+#line 248 "program_lexer.l"
 { return ENV; }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 248 "program_lexer.l"
+#line 249 "program_lexer.l"
 { return EYE; }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 249 "program_lexer.l"
+#line 250 "program_lexer.l"
 { return FOGCOORD; }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 250 "program_lexer.l"
+#line 251 "program_lexer.l"
 { return FOG; }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 251 "program_lexer.l"
+#line 252 "program_lexer.l"
 { return FRONT; }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 252 "program_lexer.l"
+#line 253 "program_lexer.l"
 { return HALF; }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 253 "program_lexer.l"
+#line 254 "program_lexer.l"
 { return INVERSE; }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 254 "program_lexer.l"
+#line 255 "program_lexer.l"
 { return INVTRANS; }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 255 "program_lexer.l"
+#line 256 "program_lexer.l"
 { return LIGHT; }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 256 "program_lexer.l"
+#line 257 "program_lexer.l"
 { return LIGHTMODEL; }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 257 "program_lexer.l"
+#line 258 "program_lexer.l"
 { return LIGHTPROD; }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 258 "program_lexer.l"
+#line 259 "program_lexer.l"
 { return LOCAL; }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 259 "program_lexer.l"
+#line 260 "program_lexer.l"
 { return MATERIAL; }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 260 "program_lexer.l"
+#line 261 "program_lexer.l"
 { return MAT_PROGRAM; }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 261 "program_lexer.l"
+#line 262 "program_lexer.l"
 { return MATRIX; }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 262 "program_lexer.l"
+#line 263 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, MATRIXINDEX); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 263 "program_lexer.l"
+#line 264 "program_lexer.l"
 { return MODELVIEW; }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 264 "program_lexer.l"
+#line 265 "program_lexer.l"
 { return MVP; }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 265 "program_lexer.l"
+#line 266 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, NORMAL); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 266 "program_lexer.l"
+#line 267 "program_lexer.l"
 { return OBJECT; }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 267 "program_lexer.l"
+#line 268 "program_lexer.l"
 { return PALETTE; }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 268 "program_lexer.l"
+#line 269 "program_lexer.l"
 { return PARAMS; }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 269 "program_lexer.l"
+#line 270 "program_lexer.l"
 { return PLANE; }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 270 "program_lexer.l"
+#line 271 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, POINT_TOK); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 271 "program_lexer.l"
+#line 272 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, POINTSIZE); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 272 "program_lexer.l"
+#line 273 "program_lexer.l"
 { return POSITION; }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 273 "program_lexer.l"
+#line 274 "program_lexer.l"
 { return PRIMARY; }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 274 "program_lexer.l"
+#line 275 "program_lexer.l"
 { return PROJECTION; }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 275 "program_lexer.l"
+#line 276 "program_lexer.l"
 { return_token_or_DOT(require_ARB_fp, RANGE); }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 276 "program_lexer.l"
+#line 277 "program_lexer.l"
 { return ROW; }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 277 "program_lexer.l"
+#line 278 "program_lexer.l"
 { return SCENECOLOR; }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 278 "program_lexer.l"
+#line 279 "program_lexer.l"
 { return SECONDARY; }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 279 "program_lexer.l"
+#line 280 "program_lexer.l"
 { return SHININESS; }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 280 "program_lexer.l"
+#line 281 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 281 "program_lexer.l"
+#line 282 "program_lexer.l"
 { return SPECULAR; }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 282 "program_lexer.l"
+#line 283 "program_lexer.l"
 { return SPOT; }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 283 "program_lexer.l"
+#line 284 "program_lexer.l"
 { return TEXCOORD; }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 284 "program_lexer.l"
+#line 285 "program_lexer.l"
 { return_token_or_DOT(require_ARB_fp, TEXENV); }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 285 "program_lexer.l"
+#line 286 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, TEXGEN); }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 286 "program_lexer.l"
+#line 287 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, TEXGEN_Q); }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 287 "program_lexer.l"
+#line 288 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, TEXGEN_S); }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 288 "program_lexer.l"
+#line 289 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, TEXGEN_T); }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 289 "program_lexer.l"
+#line 290 "program_lexer.l"
 { return TEXTURE; }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 290 "program_lexer.l"
+#line 291 "program_lexer.l"
 { return TRANSPOSE; }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 291 "program_lexer.l"
+#line 292 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, VTXATTRIB); }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 292 "program_lexer.l"
+#line 293 "program_lexer.l"
 { return_token_or_DOT(require_ARB_vp, WEIGHT); }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 294 "program_lexer.l"
+#line 295 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 295 "program_lexer.l"
+#line 296 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 296 "program_lexer.l"
+#line 297 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 297 "program_lexer.l"
+#line 298 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 298 "program_lexer.l"
+#line 299 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 299 "program_lexer.l"
+#line 300 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 300 "program_lexer.l"
+#line 301 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 301 "program_lexer.l"
+#line 302 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 302 "program_lexer.l"
+#line 303 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 303 "program_lexer.l"
+#line 304 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 304 "program_lexer.l"
+#line 305 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 305 "program_lexer.l"
+#line 306 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 306 "program_lexer.l"
+#line 307 "program_lexer.l"
 { return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 308 "program_lexer.l"
+#line 309 "program_lexer.l"
 {
    yylval->string = strdup(yytext);
    return IDENTIFIER;
@@ -2101,12 +2102,12 @@ YY_RULE_SETUP
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 313 "program_lexer.l"
+#line 314 "program_lexer.l"
 { return DOT_DOT; }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 315 "program_lexer.l"
+#line 316 "program_lexer.l"
 {
    yylval->integer = strtol(yytext, NULL, 10);
    return INTEGER;
@@ -2114,7 +2115,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 319 "program_lexer.l"
+#line 320 "program_lexer.l"
 {
    yylval->real = strtod(yytext, NULL);
    return REAL;
@@ -2126,7 +2127,7 @@ case 156:
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 323 "program_lexer.l"
+#line 324 "program_lexer.l"
 {
    yylval->real = strtod(yytext, NULL);
    return REAL;
@@ -2134,7 +2135,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 327 "program_lexer.l"
+#line 328 "program_lexer.l"
 {
    yylval->real = strtod(yytext, NULL);
    return REAL;
@@ -2142,7 +2143,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 331 "program_lexer.l"
+#line 332 "program_lexer.l"
 {
    yylval->real = strtod(yytext, NULL);
    return REAL;
@@ -2150,7 +2151,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 336 "program_lexer.l"
+#line 337 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
    yylval->swiz_mask.mask = WRITEMASK_XYZW;
@@ -2159,7 +2160,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 342 "program_lexer.l"
+#line 343 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_XY
@@ -2169,7 +2170,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 348 "program_lexer.l"
+#line 349 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_XZW;
@@ -2178,7 +2179,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 353 "program_lexer.l"
+#line 354 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_YZW;
@@ -2187,7 +2188,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 359 "program_lexer.l"
+#line 360 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_X
@@ -2197,7 +2198,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 365 "program_lexer.l"
+#line 366 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_Y
@@ -2207,7 +2208,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 371 "program_lexer.l"
+#line 372 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_ZW;
@@ -2216,7 +2217,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 377 "program_lexer.l"
+#line 378 "program_lexer.l"
 {
    const unsigned s = swiz_from_char(yytext[1]);
    yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s);
@@ -2226,7 +2227,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 384 "program_lexer.l"
+#line 385 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]),
 					    swiz_from_char(yytext[2]),
@@ -2238,7 +2239,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 393 "program_lexer.l"
+#line 394 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
    yylval->swiz_mask.mask = WRITEMASK_XYZW;
@@ -2247,7 +2248,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 399 "program_lexer.l"
+#line 400 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_XY
@@ -2257,7 +2258,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 405 "program_lexer.l"
+#line 406 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_XZW;
@@ -2266,7 +2267,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 410 "program_lexer.l"
+#line 411 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_YZW;
@@ -2275,7 +2276,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 416 "program_lexer.l"
+#line 417 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_X
@@ -2285,7 +2286,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 422 "program_lexer.l"
+#line 423 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_Y
@@ -2295,7 +2296,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 428 "program_lexer.l"
+#line 429 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
    yylval->swiz_mask.mask = WRITEMASK_ZW;
@@ -2304,7 +2305,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 434 "program_lexer.l"
+#line 435 "program_lexer.l"
 {
    const unsigned s = swiz_from_char(yytext[1]);
    yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s);
@@ -2314,7 +2315,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 442 "program_lexer.l"
+#line 443 "program_lexer.l"
 {
    if (require_ARB_vp) {
       return TEXGEN_R;
@@ -2328,7 +2329,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 453 "program_lexer.l"
+#line 454 "program_lexer.l"
 {
    yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]),
 					    swiz_from_char(yytext[2]),
@@ -2340,13 +2341,13 @@ YY_RULE_SETUP
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 462 "program_lexer.l"
+#line 463 "program_lexer.l"
 { return DOT; }
 	YY_BREAK
 case 179:
 /* rule 179 can match eol */
 YY_RULE_SETUP
-#line 464 "program_lexer.l"
+#line 465 "program_lexer.l"
 {
    yylloc->first_line++;
    yylloc->first_column = 1;
@@ -2357,7 +2358,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
-#line 471 "program_lexer.l"
+#line 472 "program_lexer.l"
 /* eat whitespace */ ;
 	YY_BREAK
 case 181:
@@ -2365,20 +2366,20 @@ case 181:
 yyg->yy_c_buf_p = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 472 "program_lexer.l"
+#line 473 "program_lexer.l"
 /* eat comments */ ;
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
-#line 473 "program_lexer.l"
+#line 474 "program_lexer.l"
 { return yytext[0]; }
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
-#line 474 "program_lexer.l"
+#line 475 "program_lexer.l"
 ECHO;
 	YY_BREAK
-#line 2382 "lex.yy.c"
+#line 2383 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -3553,7 +3554,7 @@ void yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 474 "program_lexer.l"
+#line 475 "program_lexer.l"
 
 
 
diff --git a/src/mesa/shader/program_lexer.l b/src/mesa/shader/program_lexer.l
index bc209435ef1..d2402174816 100644
--- a/src/mesa/shader/program_lexer.l
+++ b/src/mesa/shader/program_lexer.l
@@ -23,6 +23,7 @@
  */
 #include "main/glheader.h"
 #include "prog_instruction.h"
+#include "prog_statevars.h"
 
 #include "program_parser.h"
 #include "program_parse.tab.h"
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c
index 4d99e45fbed..9f2d4de90fc 100644
--- a/src/mesa/shader/program_parse.tab.c
+++ b/src/mesa/shader/program_parse.tab.c
@@ -324,7 +324,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;
@@ -4946,8 +4946,7 @@ int add_state_reference(struct gl_program_parameter_list *param_list,
 
    name = _mesa_program_state_string(tokens);
    index = _mesa_add_parameter(param_list, PROGRAM_STATE_VAR, name,
-                               size, GL_NONE,
-                               NULL, (gl_state_index *) tokens, 0x0);
+                               size, GL_NONE, NULL, tokens, 0x0);
    param_list->StateFlags |= _mesa_program_state_flags(tokens);
 
    /* free name string here since we duplicated it in add_parameter() */
diff --git a/src/mesa/shader/program_parse.tab.h b/src/mesa/shader/program_parse.tab.h
index b0f757ffa00..dabb3bf1a36 100644
--- a/src/mesa/shader/program_parse.tab.h
+++ b/src/mesa/shader/program_parse.tab.h
@@ -166,7 +166,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;
diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y
index 2f5d3037f42..06c1915fbee 100644
--- a/src/mesa/shader/program_parse.y
+++ b/src/mesa/shader/program_parse.y
@@ -117,7 +117,7 @@ static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,
    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;
@@ -2077,8 +2077,7 @@ int add_state_reference(struct gl_program_parameter_list *param_list,
 
    name = _mesa_program_state_string(tokens);
    index = _mesa_add_parameter(param_list, PROGRAM_STATE_VAR, name,
-                               size, GL_NONE,
-                               NULL, (gl_state_index *) tokens, 0x0);
+                               size, GL_NONE, NULL, tokens, 0x0);
    param_list->StateFlags |= _mesa_program_state_flags(tokens);
 
    /* free name string here since we duplicated it in add_parameter() */