xserver xkeyboard-config mesa git update 4 Marc 2011

11 files changed, 4345 insertions, 4371 deletions

diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript
index 10abab6f9..bb02a87c7 100644
--- a/mesalib/src/glsl/SConscript
+++ b/mesalib/src/glsl/SConscript
@@ -14,10 +14,16 @@ env.Prepend(CPPPATH = [
     '#src/glsl/glcpp',
 ])
 
+# Make glcpp/glcpp-parse.h and glsl_parser.h reacheable from the include path
+env.Append(CPPPATH = [Dir('.').abspath])
+
 env.Append(YACCFLAGS = '-d')
 
-parser_env = env.Clone();
-parser_env.Append(YACCFLAGS = ['--defines=src/glsl/glsl_parser.h', '-p', '_mesa_glsl_'])
+parser_env = env.Clone()
+parser_env.Append(YACCFLAGS = [
+    '--defines=%s' % File('glsl_parser.h').abspath,
+    '-p', '_mesa_glsl_',
+])
 
 glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')
 glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')
@@ -107,6 +113,10 @@ else:
                             '#src/mesa/program/symbol_table.c'],
     )
 
+    # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll
+    # depends on glsl_parser.h
+    env.Depends(builtin_compiler, glsl_parser)
+
     builtin_glsl_function = env.CodeGenerate(
         target = 'builtin_function.cpp',
         script = 'builtins/tools/generate_builtins.py',
@@ -129,6 +139,10 @@ glsl = env.ConvenienceLibrary(
     source = sources,
 )
 
+# SCons builtin dependency scanner doesn't detect that glsl_lexer.ll depends on
+# glsl_parser.h
+env.Depends(glsl, glsl_parser)
+
 Export('glsl')
 
 # FIXME: We can't build the programs because there's a cyclic dependency between tis directory and src/mesa
diff --git a/mesalib/src/glsl/glcpp/Makefile.am b/mesalib/src/glsl/glcpp/Makefile.am
deleted file mode 100644
index 8a3e9b007..000000000
--- a/mesalib/src/glsl/glcpp/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright © 2010 Intel Corporation

-# All Rights Reserved.

-#

-# Permission is hereby granted, free of charge, to any person obtaining a

-# copy of this software and associated documentation files (the "Software"),

-# to deal in the Software without restriction, including without limitation

-# on the rights to use, copy, modify, merge, publish, distribute, sub

-# license, and/or sell copies of the Software, and to permit persons to whom

-# the Software is furnished to do so, subject to the following conditions:

-#

-# The above copyright notice and this permission notice (including the next

-# paragraph) shall be included in all copies or substantial portions of the

-# Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL

-# AUTHORS, COPYRIGHT HOLDERS, AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,

-# DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

-# OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE

-# USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-noinst_LTLIBRARIES = libglcpp.la

-libglcpp_la_SOURCES = \

-	glcpp-lex.l \

-	glcpp-parse.y \

-	glcpp.h \

-	pp.c

-

-BUILT_SOURCES = glcpp-parse.h glcpp-parse.c glcpp-lex.c

-CLEANFILES = $(BUILT_SOURCES)

-

-glcpp-parse.h: glcpp-parse.c

-

-bin_PROGRAMS = glcpp

-glcpp_LDADD = libglcpp.la

-glcpp_LDFLAGS = @LDFLAGS@ $(talloc_LIBS)

-glcpp_SOURCES = glcpp.c

-

-.l.c:

-	$(LEXCOMPILE) --outfile="$@" $<

-

-test: glcpp

-	@(cd tests; ./glcpp-test)

diff --git a/mesalib/src/glsl/glcpp/glcpp-lex.l b/mesalib/src/glsl/glcpp/glcpp-lex.l
index 11b73aea8..68e44eb79 100644
--- a/mesalib/src/glsl/glcpp/glcpp-lex.l
+++ b/mesalib/src/glsl/glcpp/glcpp-lex.l
@@ -57,7 +57,7 @@ void glcpp_set_column (int  column_no , yyscan_t yyscanner);
 %option stack
 %option never-interactive
 
-%x DONE COMMENT UNREACHABLE
+%x DONE COMMENT UNREACHABLE SKIP
 
 SPACE		[[:space:]]
 NONSPACE	[^[:space:]]
@@ -74,6 +74,17 @@ OCTAL_INTEGER		0[0-7]*[uU]?
 HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 
 %%
+	/* Implicitly switch between SKIP and INITIAL (non-skipping);
+	 * don't switch if some other state was explicitly set.
+	 */
+	glcpp_parser_t *parser = yyextra;
+	if (YY_START == 0 || YY_START == SKIP) {
+		if (parser->lexing_if || parser->skip_stack == NULL || parser->skip_stack->type == SKIP_NO_SKIP) {
+			BEGIN 0;
+		} else {
+			BEGIN SKIP;
+		}
+	}
 
 	/* Single-line comments */
 "//"[^\n]* {
@@ -137,60 +148,44 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	yylineno = strtol(ptr, &ptr, 0) - 1;
 }
 
-{HASH}ifdef/.*\n {
+<SKIP,INITIAL>{
+{HASH}ifdef {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_IFDEF;
 }
 
-{HASH}ifndef/.*\n {
+{HASH}ifndef {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_IFNDEF;
 }
 
-{HASH}if/[^_a-zA-Z0-9].*\n {
+{HASH}if/[^_a-zA-Z0-9] {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_IF;
 }
 
-{HASH}elif/.*\n {
+{HASH}elif {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_ELIF;
 }
 
-{HASH}else/.*\n {
+{HASH}else {
 	yyextra->space_tokens = 0;
 	return HASH_ELSE;
 }
 
-{HASH}endif/.*\n {
+{HASH}endif {
 	yyextra->space_tokens = 0;
 	return HASH_ENDIF;
 }
-
-	/* When skipping (due to an #if 0 or similar) consume anything
-	 * up to a newline. We do this with less priority than any
-	 * #if-related directive (#if, #elif, #else, #endif), but with
-	 * more priority than any other directive or token to avoid
-	 * any side-effects from skipped content.
-	 *
-	 * We use the lexing_if flag to avoid skipping any part of an
-	 * if conditional expression. */
-[^\n]+/\n {
-	/* Since this rule always matches, YY_USER_ACTION gets called for it,
-	 * wrongly incrementing yycolumn.  We undo that effect here. */
-	yycolumn -= yyleng;
-	if (yyextra->lexing_if ||
-	    yyextra->skip_stack == NULL ||
-	    yyextra->skip_stack->type == SKIP_NO_SKIP)
-	{
-		REJECT;
-	}
 }
 
+<SKIP>[^\n] ;
+
 {HASH}error.* {
 	char *p;
 	for (p = yytext; !isalpha(p[0]); p++); /* skip "  #   " */
@@ -293,7 +288,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	}
 }
 
-\n {
+<SKIP,INITIAL>\n {
 	yyextra->lexing_if = 0;
 	yylineno++;
 	yycolumn = 0;
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index acbf86ebd..7e8bb2486 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -218,6 +218,10 @@ env.Append(YACCFLAGS = '-d')
 program_lex = env.CFile('program/lex.yy.c', 'program/program_lexer.l')
 program_parse = env.CFile('program/program_parse.tab.c',
                           'program/program_parse.y')
+
+# Make program/program_parse.tab.h reacheable from the include path
+env.Append(CPPPATH = [Dir('.').abspath])
+
 program_sources = [
     'program/arbprogparse.c',
     'program/hash_table.c',
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index a94231455..5d581c840 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -487,6 +487,7 @@ init_program_limits(GLenum type, struct gl_program_constants *prog)
    prog->MaxEnvParams = MAX_PROGRAM_ENV_PARAMS;
    prog->MaxLocalParams = MAX_PROGRAM_LOCAL_PARAMS;
    prog->MaxUniformComponents = 4 * MAX_UNIFORMS;
+   prog->MaxAddressOffset = MAX_PROGRAM_LOCAL_PARAMS;
 
    switch (type) {
    case GL_VERTEX_PROGRAM_ARB:
diff --git a/mesalib/src/mesa/main/framebuffer.c b/mesalib/src/mesa/main/framebuffer.c
index 227b214a5..8916441f4 100644
--- a/mesalib/src/mesa/main/framebuffer.c
+++ b/mesalib/src/mesa/main/framebuffer.c
@@ -799,7 +799,7 @@ update_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
       /* This is a user-created framebuffer.
        * Completeness only matters for user-created framebuffers.
        */
-      if (fb->_Status == 0) {
+      if (fb->_Status != GL_FRAMEBUFFER_COMPLETE) {
          _mesa_test_framebuffer_completeness(ctx, fb);
       }
    }
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index fcb06d49e..db3eba20c 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -2573,6 +2573,7 @@ struct gl_program_constants
    GLuint MaxAttribs;
    GLuint MaxTemps;
    GLuint MaxAddressRegs;
+   GLuint MaxAddressOffset;  /**< [-MaxAddressOffset, MaxAddressOffset-1] */
    GLuint MaxParameters;
    GLuint MaxLocalParams;
    GLuint MaxEnvParams;
diff --git a/mesalib/src/mesa/program/prog_instruction.h b/mesalib/src/mesa/program/prog_instruction.h
index 0a88e0d70..669d71029 100644
--- a/mesalib/src/mesa/program/prog_instruction.h
+++ b/mesalib/src/mesa/program/prog_instruction.h
@@ -1,454 +1,454 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.3

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-/**

- * \file prog_instruction.h

- *

- * Vertex/fragment program instruction datatypes and constants.

- *

- * \author Brian Paul

- * \author Keith Whitwell

- * \author Ian Romanick <idr@us.ibm.com>

- */

-

-

-#ifndef PROG_INSTRUCTION_H

-#define PROG_INSTRUCTION_H

-

-

-#include "main/glheader.h"

-

-

-/**

- * Swizzle indexes.

- * Do not change!

- */

-/*@{*/

-#define SWIZZLE_X    0

-#define SWIZZLE_Y    1

-#define SWIZZLE_Z    2

-#define SWIZZLE_W    3

-#define SWIZZLE_ZERO 4   /**< For SWZ instruction only */

-#define SWIZZLE_ONE  5   /**< For SWZ instruction only */

-#define SWIZZLE_NIL  7   /**< used during shader code gen (undefined value) */

-/*@}*/

-

-#define MAKE_SWIZZLE4(a,b,c,d) (((a)<<0) | ((b)<<3) | ((c)<<6) | ((d)<<9))

-#define SWIZZLE_NOOP           MAKE_SWIZZLE4(0,1,2,3)

-#define GET_SWZ(swz, idx)      (((swz) >> ((idx)*3)) & 0x7)

-#define GET_BIT(msk, idx)      (((msk) >> (idx)) & 0x1)

-

-#define SWIZZLE_XYZW MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W)

-#define SWIZZLE_XXXX MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_X, SWIZZLE_X, SWIZZLE_X)

-#define SWIZZLE_YYYY MAKE_SWIZZLE4(SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y)

-#define SWIZZLE_ZZZZ MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z)

-#define SWIZZLE_WWWW MAKE_SWIZZLE4(SWIZZLE_W, SWIZZLE_W, SWIZZLE_W, SWIZZLE_W)

-

-

-/**

- * Writemask values, 1 bit per component.

- */

-/*@{*/

-#define WRITEMASK_X     0x1

-#define WRITEMASK_Y     0x2

-#define WRITEMASK_XY    0x3

-#define WRITEMASK_Z     0x4

-#define WRITEMASK_XZ    0x5

-#define WRITEMASK_YZ    0x6

-#define WRITEMASK_XYZ   0x7

-#define WRITEMASK_W     0x8

-#define WRITEMASK_XW    0x9

-#define WRITEMASK_YW    0xa

-#define WRITEMASK_XYW   0xb

-#define WRITEMASK_ZW    0xc

-#define WRITEMASK_XZW   0xd

-#define WRITEMASK_YZW   0xe

-#define WRITEMASK_XYZW  0xf

-/*@}*/

-

-

-/**

- * Condition codes

- */

-/*@{*/

-#define COND_GT  1  /**< greater than zero */

-#define COND_EQ  2  /**< equal to zero */

-#define COND_LT  3  /**< less than zero */

-#define COND_UN  4  /**< unordered (NaN) */

-#define COND_GE  5  /**< greater than or equal to zero */

-#define COND_LE  6  /**< less than or equal to zero */

-#define COND_NE  7  /**< not equal to zero */

-#define COND_TR  8  /**< always true */

-#define COND_FL  9  /**< always false */

-/*@}*/

-

-

-/**

- * Instruction precision for GL_NV_fragment_program

- */

-/*@{*/

-#define FLOAT32  0x1

-#define FLOAT16  0x2

-#define FIXED12  0x4

-/*@}*/

-

-

-/**

- * Saturation modes when storing values.

- */

-/*@{*/

-#define SATURATE_OFF            0

-#define SATURATE_ZERO_ONE       1

-/*@}*/

-

-

-/**

- * Per-component negation masks

- */

-/*@{*/

-#define NEGATE_X    0x1

-#define NEGATE_Y    0x2

-#define NEGATE_Z    0x4

-#define NEGATE_W    0x8

-#define NEGATE_XYZ  0x7

-#define NEGATE_XYZW 0xf

-#define NEGATE_NONE 0x0

-/*@}*/

-

-

-/**

- * Program instruction opcodes for vertex, fragment and geometry programs.

- */

-typedef enum prog_opcode {

-                     /* ARB_vp   ARB_fp   NV_vp   NV_fp     GLSL */

-                     /*------------------------------------------*/

-   OPCODE_NOP = 0,   /*                                      X   */

-   OPCODE_ABS,       /*   X        X       1.1               X   */

-   OPCODE_ADD,       /*   X        X       X       X         X   */

-   OPCODE_AND,       /*                                          */

-   OPCODE_ARA,       /*                    2                     */

-   OPCODE_ARL,       /*   X                X                 X   */

-   OPCODE_ARL_NV,    /*                    2                     */

-   OPCODE_ARR,       /*                    2                     */

-   OPCODE_BGNLOOP,   /*                                     opt  */

-   OPCODE_BGNSUB,    /*                                     opt  */

-   OPCODE_BRA,       /*                    2                 X   */

-   OPCODE_BRK,       /*                    2                opt  */

-   OPCODE_CAL,       /*                    2       2         X   */

-   OPCODE_CMP,       /*            X                         X   */

-   OPCODE_CONT,      /*                                     opt  */

-   OPCODE_COS,       /*            X       2       X         X   */

-   OPCODE_DDX,       /*                            X         X   */

-   OPCODE_DDY,       /*                            X         X   */

-   OPCODE_DP2,       /*                            2         X   */

-   OPCODE_DP2A,      /*                            2             */

-   OPCODE_DP3,       /*   X        X       X       X         X   */

-   OPCODE_DP4,       /*   X        X       X       X         X   */

-   OPCODE_DPH,       /*   X        X       1.1                   */

-   OPCODE_DST,       /*   X        X       X       X             */

-   OPCODE_ELSE,      /*                                      X   */

-   OPCODE_EMIT_VERTEX,/*                                     X   */

-   OPCODE_END,       /*   X        X       X       X        opt  */

-   OPCODE_END_PRIMITIVE,/*                                   X   */

-   OPCODE_ENDIF,     /*                                     opt  */

-   OPCODE_ENDLOOP,   /*                                     opt  */

-   OPCODE_ENDSUB,    /*                                     opt  */

-   OPCODE_EX2,       /*   X        X       2       X         X   */

-   OPCODE_EXP,       /*   X                X                 X   */

-   OPCODE_FLR,       /*   X        X       2       X         X   */

-   OPCODE_FRC,       /*   X        X       2       X         X   */

-   OPCODE_IF,        /*                                     opt  */

-   OPCODE_KIL,       /*            X                             */

-   OPCODE_KIL_NV,    /*                            X         X   */

-   OPCODE_LG2,       /*   X        X       2       X         X   */

-   OPCODE_LIT,       /*   X        X       X       X             */

-   OPCODE_LOG,       /*   X                X                 X   */

-   OPCODE_LRP,       /*            X               X         X   */

-   OPCODE_MAD,       /*   X        X       X       X         X   */

-   OPCODE_MAX,       /*   X        X       X       X         X   */

-   OPCODE_MIN,       /*   X        X       X       X         X   */

-   OPCODE_MOV,       /*   X        X       X       X         X   */

-   OPCODE_MUL,       /*   X        X       X       X         X   */

-   OPCODE_NOISE1,    /*                                      X   */

-   OPCODE_NOISE2,    /*                                      X   */

-   OPCODE_NOISE3,    /*                                      X   */

-   OPCODE_NOISE4,    /*                                      X   */

-   OPCODE_NOT,       /*                                          */

-   OPCODE_NRM3,      /*                                      X   */

-   OPCODE_NRM4,      /*                                      X   */

-   OPCODE_OR,        /*                                          */

-   OPCODE_PK2H,      /*                            X             */

-   OPCODE_PK2US,     /*                            X             */

-   OPCODE_PK4B,      /*                            X             */

-   OPCODE_PK4UB,     /*                            X             */

-   OPCODE_POW,       /*   X        X               X         X   */

-   OPCODE_POPA,      /*                    3                     */

-   OPCODE_PRINT,     /*                    X       X             */

-   OPCODE_PUSHA,     /*                    3                     */

-   OPCODE_RCC,       /*                    1.1                   */

-   OPCODE_RCP,       /*   X        X       X       X         X   */

-   OPCODE_RET,       /*                    2       2         X   */

-   OPCODE_RFL,       /*            X               X             */

-   OPCODE_RSQ,       /*   X        X       X       X         X   */

-   OPCODE_SCS,       /*            X                             */

-   OPCODE_SEQ,       /*                    2       X         X   */

-   OPCODE_SFL,       /*                    2       X             */

-   OPCODE_SGE,       /*   X        X       X       X         X   */

-   OPCODE_SGT,       /*                    2       X         X   */

-   OPCODE_SIN,       /*            X       2       X         X   */

-   OPCODE_SLE,       /*                    2       X         X   */

-   OPCODE_SLT,       /*   X        X       X       X         X   */

-   OPCODE_SNE,       /*                    2       X         X   */

-   OPCODE_SSG,       /*                    2                     */

-   OPCODE_STR,       /*                    2       X             */

-   OPCODE_SUB,       /*   X        X       1.1     X         X   */

-   OPCODE_SWZ,       /*   X        X                             */

-   OPCODE_TEX,       /*            X       3       X         X   */

-   OPCODE_TXB,       /*            X       3                 X   */

-   OPCODE_TXD,       /*                            X         X   */

-   OPCODE_TXL,       /*                    3       2         X   */

-   OPCODE_TXP,       /*            X                         X   */

-   OPCODE_TXP_NV,    /*                    3       X             */

-   OPCODE_TRUNC,     /*                                      X   */

-   OPCODE_UP2H,      /*                            X             */

-   OPCODE_UP2US,     /*                            X             */

-   OPCODE_UP4B,      /*                            X             */

-   OPCODE_UP4UB,     /*                            X             */

-   OPCODE_X2D,       /*                            X             */

-   OPCODE_XOR,       /*                                          */

-   OPCODE_XPD,       /*   X        X                         X   */

-   MAX_OPCODE

-} gl_inst_opcode;

-

-

-/**

- * Number of bits for the src/dst register Index field.

- * This limits the size of temp/uniform register files.

- */

-#define INST_INDEX_BITS 11

-

-

-/**

- * Instruction source register.

- */

-struct prog_src_register

-{

-   GLuint File:4;	/**< One of the PROGRAM_* register file values. */

-   GLint Index:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.

-                                     * May be negative for relative addressing.

-                                     */

-   GLuint Swizzle:12;

-   GLuint RelAddr:1;

-

-   /** Take the component-wise absolute value */

-   GLuint Abs:1;

-

-   /**

-    * Post-Abs negation.

-    * This will either be NEGATE_NONE or NEGATE_XYZW, except for the SWZ

-    * instruction which allows per-component negation.

-    */

-   GLuint Negate:4;

-

-   /**

-    * Is the register two-dimensional.

-    * Two dimensional registers are of the

-    * REGISTER[index][index2] format.

-    * They are used by the geometry shaders where

-    * the first index is the index within an array

-    * and the second index is the semantic of the

-    * array, e.g. gl_PositionIn[index] would become

-    * INPUT[index][gl_PositionIn]

-    */

-   GLuint HasIndex2:1;

-   GLuint RelAddr2:1;

-   GLint Index2:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.

-                                       * May be negative for relative

-                                       * addressing. */

-};

-

-

-/**

- * Instruction destination register.

- */

-struct prog_dst_register

-{

-   GLuint File:4;      /**< One of the PROGRAM_* register file values */

-   GLuint Index:INST_INDEX_BITS;  /**< Unsigned, never negative */

-   GLuint WriteMask:4;

-   GLuint RelAddr:1;

-

-   /**

-    * \name Conditional destination update control.

-    *

-    * \since

-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,

-    * NV_vertex_program2_option.

-    */

-   /*@{*/

-   /**

-    * Takes one of the 9 possible condition values (EQ, FL, GT, GE, LE, LT,

-    * NE, TR, or UN).  Dest reg is only written to if the matching

-    * (swizzled) condition code value passes.  When a conditional update mask

-    * is not specified, this will be \c COND_TR.

-    */

-   GLuint CondMask:4;

-

-   /**

-    * Condition code swizzle value.

-    */

-   GLuint CondSwizzle:12;

-

-   /**

-    * Selects the condition code register to use for conditional destination

-    * update masking.  In NV_fragmnet_program or NV_vertex_program2 mode, only

-    * condition code register 0 is available.  In NV_vertex_program3 mode,

-    * condition code registers 0 and 1 are available.

-    */

-   GLuint CondSrc:1;

-   /*@}*/

-};

-

-

-/**

- * Vertex/fragment program instruction.

- */

-struct prog_instruction

-{

-   gl_inst_opcode Opcode;

-   struct prog_src_register SrcReg[3];

-   struct prog_dst_register DstReg;

-

-   /**

-    * Indicates that the instruction should update the condition code

-    * register.

-    *

-    * \since

-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,

-    * NV_vertex_program2_option.

-    */

-   GLuint CondUpdate:1;

-

-   /**

-    * If prog_instruction::CondUpdate is \c GL_TRUE, this value selects the

-    * condition code register that is to be updated.

-    *

-    * In GL_NV_fragment_program or GL_NV_vertex_program2 mode, only condition

-    * code register 0 is available.  In GL_NV_vertex_program3 mode, condition

-    * code registers 0 and 1 are available.

-    *

-    * \since

-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,

-    * NV_vertex_program2_option.

-    */

-   GLuint CondDst:1;

-

-   /**

-    * Saturate each value of the vectored result to the range [0,1] or the

-    * range [-1,1].  \c SSAT mode (i.e., saturation to the range [-1,1]) is

-    * only available in NV_fragment_program2 mode.

-    * Value is one of the SATURATE_* tokens.

-    *

-    * \since

-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program3.

-    */

-   GLuint SaturateMode:2;

-

-   /**

-    * Per-instruction selectable precision: FLOAT32, FLOAT16, FIXED12.

-    *

-    * \since

-    * NV_fragment_program, NV_fragment_program_option.

-    */

-   GLuint Precision:3;

-

-   /**

-    * \name Extra fields for TEX, TXB, TXD, TXL, TXP instructions.

-    */

-   /*@{*/

-   /** Source texture unit. */

-   GLuint TexSrcUnit:5;

-

-   /** Source texture target, one of TEXTURE_{1D,2D,3D,CUBE,RECT}_INDEX */

-   GLuint TexSrcTarget:3;

-

-   /** True if tex instruction should do shadow comparison */

-   GLuint TexShadow:1;

-   /*@}*/

-

-   /**

-    * For BRA and CAL instructions, the location to jump to.

-    * For BGNLOOP, points to ENDLOOP (and vice-versa).

-    * For BRK, points to ENDLOOP

-    * For IF, points to ELSE or ENDIF.

-    * For ELSE, points to ENDIF.

-    */

-   GLint BranchTarget;

-

-   /** for debugging purposes */

-   const char *Comment;

-

-   /** Arbitrary data.  Used for OPCODE_PRINT and some drivers */

-   void *Data;

-

-   /** for driver use (try to remove someday) */

-   GLint Aux;

-};

-

-

-extern void

-_mesa_init_instructions(struct prog_instruction *inst, GLuint count);

-

-extern struct prog_instruction *

-_mesa_alloc_instructions(GLuint numInst);

-

-extern struct prog_instruction *

-_mesa_realloc_instructions(struct prog_instruction *oldInst,

-                           GLuint numOldInst, GLuint numNewInst);

-

-extern struct prog_instruction *

-_mesa_copy_instructions(struct prog_instruction *dest,

-                        const struct prog_instruction *src, GLuint n);

-

-extern void

-_mesa_free_instructions(struct prog_instruction *inst, GLuint count);

-

-extern GLuint

-_mesa_num_inst_src_regs(gl_inst_opcode opcode);

-

-extern GLuint

-_mesa_num_inst_dst_regs(gl_inst_opcode opcode);

-

-extern GLboolean

-_mesa_is_tex_instruction(gl_inst_opcode opcode);

-

-extern GLboolean

-_mesa_check_soa_dependencies(const struct prog_instruction *inst);

-

-extern const char *

-_mesa_opcode_string(gl_inst_opcode opcode);

-

-

-#endif /* PROG_INSTRUCTION_H */

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.3
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file prog_instruction.h
+ *
+ * Vertex/fragment program instruction datatypes and constants.
+ *
+ * \author Brian Paul
+ * \author Keith Whitwell
+ * \author Ian Romanick <idr@us.ibm.com>
+ */
+
+
+#ifndef PROG_INSTRUCTION_H
+#define PROG_INSTRUCTION_H
+
+
+#include "main/glheader.h"
+
+
+/**
+ * Swizzle indexes.
+ * Do not change!
+ */
+/*@{*/
+#define SWIZZLE_X    0
+#define SWIZZLE_Y    1
+#define SWIZZLE_Z    2
+#define SWIZZLE_W    3
+#define SWIZZLE_ZERO 4   /**< For SWZ instruction only */
+#define SWIZZLE_ONE  5   /**< For SWZ instruction only */
+#define SWIZZLE_NIL  7   /**< used during shader code gen (undefined value) */
+/*@}*/
+
+#define MAKE_SWIZZLE4(a,b,c,d) (((a)<<0) | ((b)<<3) | ((c)<<6) | ((d)<<9))
+#define SWIZZLE_NOOP           MAKE_SWIZZLE4(0,1,2,3)
+#define GET_SWZ(swz, idx)      (((swz) >> ((idx)*3)) & 0x7)
+#define GET_BIT(msk, idx)      (((msk) >> (idx)) & 0x1)
+
+#define SWIZZLE_XYZW MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_W)
+#define SWIZZLE_XXXX MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_X, SWIZZLE_X, SWIZZLE_X)
+#define SWIZZLE_YYYY MAKE_SWIZZLE4(SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y, SWIZZLE_Y)
+#define SWIZZLE_ZZZZ MAKE_SWIZZLE4(SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z, SWIZZLE_Z)
+#define SWIZZLE_WWWW MAKE_SWIZZLE4(SWIZZLE_W, SWIZZLE_W, SWIZZLE_W, SWIZZLE_W)
+
+
+/**
+ * Writemask values, 1 bit per component.
+ */
+/*@{*/
+#define WRITEMASK_X     0x1
+#define WRITEMASK_Y     0x2
+#define WRITEMASK_XY    0x3
+#define WRITEMASK_Z     0x4
+#define WRITEMASK_XZ    0x5
+#define WRITEMASK_YZ    0x6
+#define WRITEMASK_XYZ   0x7
+#define WRITEMASK_W     0x8
+#define WRITEMASK_XW    0x9
+#define WRITEMASK_YW    0xa
+#define WRITEMASK_XYW   0xb
+#define WRITEMASK_ZW    0xc
+#define WRITEMASK_XZW   0xd
+#define WRITEMASK_YZW   0xe
+#define WRITEMASK_XYZW  0xf
+/*@}*/
+
+
+/**
+ * Condition codes
+ */
+/*@{*/
+#define COND_GT  1  /**< greater than zero */
+#define COND_EQ  2  /**< equal to zero */
+#define COND_LT  3  /**< less than zero */
+#define COND_UN  4  /**< unordered (NaN) */
+#define COND_GE  5  /**< greater than or equal to zero */
+#define COND_LE  6  /**< less than or equal to zero */
+#define COND_NE  7  /**< not equal to zero */
+#define COND_TR  8  /**< always true */
+#define COND_FL  9  /**< always false */
+/*@}*/
+
+
+/**
+ * Instruction precision for GL_NV_fragment_program
+ */
+/*@{*/
+#define FLOAT32  0x1
+#define FLOAT16  0x2
+#define FIXED12  0x4
+/*@}*/
+
+
+/**
+ * Saturation modes when storing values.
+ */
+/*@{*/
+#define SATURATE_OFF            0
+#define SATURATE_ZERO_ONE       1
+/*@}*/
+
+
+/**
+ * Per-component negation masks
+ */
+/*@{*/
+#define NEGATE_X    0x1
+#define NEGATE_Y    0x2
+#define NEGATE_Z    0x4
+#define NEGATE_W    0x8
+#define NEGATE_XYZ  0x7
+#define NEGATE_XYZW 0xf
+#define NEGATE_NONE 0x0
+/*@}*/
+
+
+/**
+ * Program instruction opcodes for vertex, fragment and geometry programs.
+ */
+typedef enum prog_opcode {
+                     /* ARB_vp   ARB_fp   NV_vp   NV_fp     GLSL */
+                     /*------------------------------------------*/
+   OPCODE_NOP = 0,   /*                                      X   */
+   OPCODE_ABS,       /*   X        X       1.1               X   */
+   OPCODE_ADD,       /*   X        X       X       X         X   */
+   OPCODE_AND,       /*                                          */
+   OPCODE_ARA,       /*                    2                     */
+   OPCODE_ARL,       /*   X                X                 X   */
+   OPCODE_ARL_NV,    /*                    2                     */
+   OPCODE_ARR,       /*                    2                     */
+   OPCODE_BGNLOOP,   /*                                     opt  */
+   OPCODE_BGNSUB,    /*                                     opt  */
+   OPCODE_BRA,       /*                    2                 X   */
+   OPCODE_BRK,       /*                    2                opt  */
+   OPCODE_CAL,       /*                    2       2         X   */
+   OPCODE_CMP,       /*            X                         X   */
+   OPCODE_CONT,      /*                                     opt  */
+   OPCODE_COS,       /*            X       2       X         X   */
+   OPCODE_DDX,       /*                            X         X   */
+   OPCODE_DDY,       /*                            X         X   */
+   OPCODE_DP2,       /*                            2         X   */
+   OPCODE_DP2A,      /*                            2             */
+   OPCODE_DP3,       /*   X        X       X       X         X   */
+   OPCODE_DP4,       /*   X        X       X       X         X   */
+   OPCODE_DPH,       /*   X        X       1.1                   */
+   OPCODE_DST,       /*   X        X       X       X             */
+   OPCODE_ELSE,      /*                                      X   */
+   OPCODE_EMIT_VERTEX,/*                                     X   */
+   OPCODE_END,       /*   X        X       X       X        opt  */
+   OPCODE_END_PRIMITIVE,/*                                   X   */
+   OPCODE_ENDIF,     /*                                     opt  */
+   OPCODE_ENDLOOP,   /*                                     opt  */
+   OPCODE_ENDSUB,    /*                                     opt  */
+   OPCODE_EX2,       /*   X        X       2       X         X   */
+   OPCODE_EXP,       /*   X                X                 X   */
+   OPCODE_FLR,       /*   X        X       2       X         X   */
+   OPCODE_FRC,       /*   X        X       2       X         X   */
+   OPCODE_IF,        /*                                     opt  */
+   OPCODE_KIL,       /*            X                             */
+   OPCODE_KIL_NV,    /*                            X         X   */
+   OPCODE_LG2,       /*   X        X       2       X         X   */
+   OPCODE_LIT,       /*   X        X       X       X             */
+   OPCODE_LOG,       /*   X                X                 X   */
+   OPCODE_LRP,       /*            X               X         X   */
+   OPCODE_MAD,       /*   X        X       X       X         X   */
+   OPCODE_MAX,       /*   X        X       X       X         X   */
+   OPCODE_MIN,       /*   X        X       X       X         X   */
+   OPCODE_MOV,       /*   X        X       X       X         X   */
+   OPCODE_MUL,       /*   X        X       X       X         X   */
+   OPCODE_NOISE1,    /*                                      X   */
+   OPCODE_NOISE2,    /*                                      X   */
+   OPCODE_NOISE3,    /*                                      X   */
+   OPCODE_NOISE4,    /*                                      X   */
+   OPCODE_NOT,       /*                                          */
+   OPCODE_NRM3,      /*                                      X   */
+   OPCODE_NRM4,      /*                                      X   */
+   OPCODE_OR,        /*                                          */
+   OPCODE_PK2H,      /*                            X             */
+   OPCODE_PK2US,     /*                            X             */
+   OPCODE_PK4B,      /*                            X             */
+   OPCODE_PK4UB,     /*                            X             */
+   OPCODE_POW,       /*   X        X               X         X   */
+   OPCODE_POPA,      /*                    3                     */
+   OPCODE_PRINT,     /*                    X       X             */
+   OPCODE_PUSHA,     /*                    3                     */
+   OPCODE_RCC,       /*                    1.1                   */
+   OPCODE_RCP,       /*   X        X       X       X         X   */
+   OPCODE_RET,       /*                    2       2         X   */
+   OPCODE_RFL,       /*            X               X             */
+   OPCODE_RSQ,       /*   X        X       X       X         X   */
+   OPCODE_SCS,       /*            X                             */
+   OPCODE_SEQ,       /*                    2       X         X   */
+   OPCODE_SFL,       /*                    2       X             */
+   OPCODE_SGE,       /*   X        X       X       X         X   */
+   OPCODE_SGT,       /*                    2       X         X   */
+   OPCODE_SIN,       /*            X       2       X         X   */
+   OPCODE_SLE,       /*                    2       X         X   */
+   OPCODE_SLT,       /*   X        X       X       X         X   */
+   OPCODE_SNE,       /*                    2       X         X   */
+   OPCODE_SSG,       /*                    2                     */
+   OPCODE_STR,       /*                    2       X             */
+   OPCODE_SUB,       /*   X        X       1.1     X         X   */
+   OPCODE_SWZ,       /*   X        X                             */
+   OPCODE_TEX,       /*            X       3       X         X   */
+   OPCODE_TXB,       /*            X       3                 X   */
+   OPCODE_TXD,       /*                            X         X   */
+   OPCODE_TXL,       /*                    3       2         X   */
+   OPCODE_TXP,       /*            X                         X   */
+   OPCODE_TXP_NV,    /*                    3       X             */
+   OPCODE_TRUNC,     /*                                      X   */
+   OPCODE_UP2H,      /*                            X             */
+   OPCODE_UP2US,     /*                            X             */
+   OPCODE_UP4B,      /*                            X             */
+   OPCODE_UP4UB,     /*                            X             */
+   OPCODE_X2D,       /*                            X             */
+   OPCODE_XOR,       /*                                          */
+   OPCODE_XPD,       /*   X        X                         X   */
+   MAX_OPCODE
+} gl_inst_opcode;
+
+
+/**
+ * Number of bits for the src/dst register Index field.
+ * This limits the size of temp/uniform register files.
+ */
+#define INST_INDEX_BITS 12
+
+
+/**
+ * Instruction source register.
+ */
+struct prog_src_register
+{
+   GLuint File:4;	/**< One of the PROGRAM_* register file values. */
+   GLint Index:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.
+                                     * May be negative for relative addressing.
+                                     */
+   GLuint Swizzle:12;
+   GLuint RelAddr:1;
+
+   /** Take the component-wise absolute value */
+   GLuint Abs:1;
+
+   /**
+    * Post-Abs negation.
+    * This will either be NEGATE_NONE or NEGATE_XYZW, except for the SWZ
+    * instruction which allows per-component negation.
+    */
+   GLuint Negate:4;
+
+   /**
+    * Is the register two-dimensional.
+    * Two dimensional registers are of the
+    * REGISTER[index][index2] format.
+    * They are used by the geometry shaders where
+    * the first index is the index within an array
+    * and the second index is the semantic of the
+    * array, e.g. gl_PositionIn[index] would become
+    * INPUT[index][gl_PositionIn]
+    */
+   GLuint HasIndex2:1;
+   GLuint RelAddr2:1;
+   GLint Index2:(INST_INDEX_BITS+1); /**< Extra bit here for sign bit.
+                                       * May be negative for relative
+                                       * addressing. */
+};
+
+
+/**
+ * Instruction destination register.
+ */
+struct prog_dst_register
+{
+   GLuint File:4;      /**< One of the PROGRAM_* register file values */
+   GLuint Index:INST_INDEX_BITS;  /**< Unsigned, never negative */
+   GLuint WriteMask:4;
+   GLuint RelAddr:1;
+
+   /**
+    * \name Conditional destination update control.
+    *
+    * \since
+    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
+    * NV_vertex_program2_option.
+    */
+   /*@{*/
+   /**
+    * Takes one of the 9 possible condition values (EQ, FL, GT, GE, LE, LT,
+    * NE, TR, or UN).  Dest reg is only written to if the matching
+    * (swizzled) condition code value passes.  When a conditional update mask
+    * is not specified, this will be \c COND_TR.
+    */
+   GLuint CondMask:4;
+
+   /**
+    * Condition code swizzle value.
+    */
+   GLuint CondSwizzle:12;
+
+   /**
+    * Selects the condition code register to use for conditional destination
+    * update masking.  In NV_fragmnet_program or NV_vertex_program2 mode, only
+    * condition code register 0 is available.  In NV_vertex_program3 mode,
+    * condition code registers 0 and 1 are available.
+    */
+   GLuint CondSrc:1;
+   /*@}*/
+};
+
+
+/**
+ * Vertex/fragment program instruction.
+ */
+struct prog_instruction
+{
+   gl_inst_opcode Opcode;
+   struct prog_src_register SrcReg[3];
+   struct prog_dst_register DstReg;
+
+   /**
+    * Indicates that the instruction should update the condition code
+    * register.
+    *
+    * \since
+    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
+    * NV_vertex_program2_option.
+    */
+   GLuint CondUpdate:1;
+
+   /**
+    * If prog_instruction::CondUpdate is \c GL_TRUE, this value selects the
+    * condition code register that is to be updated.
+    *
+    * In GL_NV_fragment_program or GL_NV_vertex_program2 mode, only condition
+    * code register 0 is available.  In GL_NV_vertex_program3 mode, condition
+    * code registers 0 and 1 are available.
+    *
+    * \since
+    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
+    * NV_vertex_program2_option.
+    */
+   GLuint CondDst:1;
+
+   /**
+    * Saturate each value of the vectored result to the range [0,1] or the
+    * range [-1,1].  \c SSAT mode (i.e., saturation to the range [-1,1]) is
+    * only available in NV_fragment_program2 mode.
+    * Value is one of the SATURATE_* tokens.
+    *
+    * \since
+    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program3.
+    */
+   GLuint SaturateMode:2;
+
+   /**
+    * Per-instruction selectable precision: FLOAT32, FLOAT16, FIXED12.
+    *
+    * \since
+    * NV_fragment_program, NV_fragment_program_option.
+    */
+   GLuint Precision:3;
+
+   /**
+    * \name Extra fields for TEX, TXB, TXD, TXL, TXP instructions.
+    */
+   /*@{*/
+   /** Source texture unit. */
+   GLuint TexSrcUnit:5;
+
+   /** Source texture target, one of TEXTURE_{1D,2D,3D,CUBE,RECT}_INDEX */
+   GLuint TexSrcTarget:3;
+
+   /** True if tex instruction should do shadow comparison */
+   GLuint TexShadow:1;
+   /*@}*/
+
+   /**
+    * For BRA and CAL instructions, the location to jump to.
+    * For BGNLOOP, points to ENDLOOP (and vice-versa).
+    * For BRK, points to ENDLOOP
+    * For IF, points to ELSE or ENDIF.
+    * For ELSE, points to ENDIF.
+    */
+   GLint BranchTarget;
+
+   /** for debugging purposes */
+   const char *Comment;
+
+   /** Arbitrary data.  Used for OPCODE_PRINT and some drivers */
+   void *Data;
+
+   /** for driver use (try to remove someday) */
+   GLint Aux;
+};
+
+
+extern void
+_mesa_init_instructions(struct prog_instruction *inst, GLuint count);
+
+extern struct prog_instruction *
+_mesa_alloc_instructions(GLuint numInst);
+
+extern struct prog_instruction *
+_mesa_realloc_instructions(struct prog_instruction *oldInst,
+                           GLuint numOldInst, GLuint numNewInst);
+
+extern struct prog_instruction *
+_mesa_copy_instructions(struct prog_instruction *dest,
+                        const struct prog_instruction *src, GLuint n);
+
+extern void
+_mesa_free_instructions(struct prog_instruction *inst, GLuint count);
+
+extern GLuint
+_mesa_num_inst_src_regs(gl_inst_opcode opcode);
+
+extern GLuint
+_mesa_num_inst_dst_regs(gl_inst_opcode opcode);
+
+extern GLboolean
+_mesa_is_tex_instruction(gl_inst_opcode opcode);
+
+extern GLboolean
+_mesa_check_soa_dependencies(const struct prog_instruction *inst);
+
+extern const char *
+_mesa_opcode_string(gl_inst_opcode opcode);
+
+
+#endif /* PROG_INSTRUCTION_H */
diff --git a/mesalib/src/mesa/program/program.c b/mesalib/src/mesa/program/program.c
index 8bd26d0d7..cfdd0da86 100644
--- a/mesalib/src/mesa/program/program.c
+++ b/mesalib/src/mesa/program/program.c
@@ -1,1074 +1,1077 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5.3

- *

- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-/**

- * \file program.c

- * Vertex and fragment program support functions.

- * \author Brian Paul

- */

-

-

-#include "main/glheader.h"

-#include "main/context.h"

-#include "main/hash.h"

-#include "main/mfeatures.h"

-#include "program.h"

-#include "prog_cache.h"

-#include "prog_parameter.h"

-#include "prog_instruction.h"

-

-

-/**

- * A pointer to this dummy program is put into the hash table when

- * glGenPrograms is called.

- */

-struct gl_program _mesa_DummyProgram;

-

-

-/**

- * Init context's vertex/fragment program state

- */

-void

-_mesa_init_program(struct gl_context *ctx)

-{

-   GLuint i;

-

-   /*

-    * If this assertion fails, we need to increase the field

-    * size for register indexes (see INST_INDEX_BITS).

-    */

-   ASSERT(ctx->Const.VertexProgram.MaxUniformComponents / 4

-          <= (1 << INST_INDEX_BITS));

-   ASSERT(ctx->Const.FragmentProgram.MaxUniformComponents / 4

-          <= (1 << INST_INDEX_BITS));

-

-   ASSERT(ctx->Const.VertexProgram.MaxTemps <= (1 << INST_INDEX_BITS));

-   ASSERT(ctx->Const.VertexProgram.MaxLocalParams <= (1 << INST_INDEX_BITS));

-   ASSERT(ctx->Const.FragmentProgram.MaxTemps <= (1 << INST_INDEX_BITS));

-   ASSERT(ctx->Const.FragmentProgram.MaxLocalParams <= (1 << INST_INDEX_BITS));

-

-   ASSERT(ctx->Const.VertexProgram.MaxUniformComponents <= 4 * MAX_UNIFORMS);

-   ASSERT(ctx->Const.FragmentProgram.MaxUniformComponents <= 4 * MAX_UNIFORMS);

-

-   /* If this fails, increase prog_instruction::TexSrcUnit size */

-   ASSERT(MAX_TEXTURE_UNITS < (1 << 5));

-

-   /* If this fails, increase prog_instruction::TexSrcTarget size */

-   ASSERT(NUM_TEXTURE_TARGETS < (1 << 3));

-

-   ctx->Program.ErrorPos = -1;

-   ctx->Program.ErrorString = _mesa_strdup("");

-

-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program

-   ctx->VertexProgram.Enabled = GL_FALSE;

-#if FEATURE_es2_glsl

-   ctx->VertexProgram.PointSizeEnabled =

-      (ctx->API == API_OPENGLES2) ? GL_TRUE : GL_FALSE;

-#else

-   ctx->VertexProgram.PointSizeEnabled = GL_FALSE;

-#endif

-   ctx->VertexProgram.TwoSideEnabled = GL_FALSE;

-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,

-                            ctx->Shared->DefaultVertexProgram);

-   assert(ctx->VertexProgram.Current);

-   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {

-      ctx->VertexProgram.TrackMatrix[i] = GL_NONE;

-      ctx->VertexProgram.TrackMatrixTransform[i] = GL_IDENTITY_NV;

-   }

-   ctx->VertexProgram.Cache = _mesa_new_program_cache();

-#endif

-

-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program

-   ctx->FragmentProgram.Enabled = GL_FALSE;

-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,

-                            ctx->Shared->DefaultFragmentProgram);

-   assert(ctx->FragmentProgram.Current);

-   ctx->FragmentProgram.Cache = _mesa_new_program_cache();

-#endif

-

-#if FEATURE_ARB_geometry_shader4

-   ctx->GeometryProgram.Enabled = GL_FALSE;

-   /* right now by default we don't have a geometry program */

-   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,

-                            NULL);

-   ctx->GeometryProgram.Cache = _mesa_new_program_cache();

-#endif

-

-   /* XXX probably move this stuff */

-#if FEATURE_ATI_fragment_shader

-   ctx->ATIFragmentShader.Enabled = GL_FALSE;

-   ctx->ATIFragmentShader.Current = ctx->Shared->DefaultFragmentShader;

-   assert(ctx->ATIFragmentShader.Current);

-   ctx->ATIFragmentShader.Current->RefCount++;

-#endif

-}

-

-

-/**

- * Free a context's vertex/fragment program state

- */

-void

-_mesa_free_program_data(struct gl_context *ctx)

-{

-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program

-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, NULL);

-   _mesa_delete_program_cache(ctx, ctx->VertexProgram.Cache);

-#endif

-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program

-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);

-   _mesa_delete_program_cache(ctx, ctx->FragmentProgram.Cache);

-#endif

-#if FEATURE_ARB_geometry_shader4

-   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);

-   _mesa_delete_program_cache(ctx, ctx->GeometryProgram.Cache);

-#endif

-   /* XXX probably move this stuff */

-#if FEATURE_ATI_fragment_shader

-   if (ctx->ATIFragmentShader.Current) {

-      ctx->ATIFragmentShader.Current->RefCount--;

-      if (ctx->ATIFragmentShader.Current->RefCount <= 0) {

-         free(ctx->ATIFragmentShader.Current);

-      }

-   }

-#endif

-   free((void *) ctx->Program.ErrorString);

-}

-

-

-/**

- * Update the default program objects in the given context to reference those

- * specified in the shared state and release those referencing the old

- * shared state.

- */

-void

-_mesa_update_default_objects_program(struct gl_context *ctx)

-{

-#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program

-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,

-                            (struct gl_vertex_program *)

-                            ctx->Shared->DefaultVertexProgram);

-   assert(ctx->VertexProgram.Current);

-#endif

-

-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program

-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,

-                            (struct gl_fragment_program *)

-                            ctx->Shared->DefaultFragmentProgram);

-   assert(ctx->FragmentProgram.Current);

-#endif

-

-#if FEATURE_ARB_geometry_shader4

-   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,

-                            (struct gl_geometry_program *)

-                            ctx->Shared->DefaultGeometryProgram);

-#endif

-

-   /* XXX probably move this stuff */

-#if FEATURE_ATI_fragment_shader

-   if (ctx->ATIFragmentShader.Current) {

-      ctx->ATIFragmentShader.Current->RefCount--;

-      if (ctx->ATIFragmentShader.Current->RefCount <= 0) {

-         free(ctx->ATIFragmentShader.Current);

-      }

-   }

-   ctx->ATIFragmentShader.Current = (struct ati_fragment_shader *) ctx->Shared->DefaultFragmentShader;

-   assert(ctx->ATIFragmentShader.Current);

-   ctx->ATIFragmentShader.Current->RefCount++;

-#endif

-}

-

-

-/**

- * Set the vertex/fragment program error state (position and error string).

- * This is generally called from within the parsers.

- */

-void

-_mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string)

-{

-   ctx->Program.ErrorPos = pos;

-   free((void *) ctx->Program.ErrorString);

-   if (!string)

-      string = "";

-   ctx->Program.ErrorString = _mesa_strdup(string);

-}

-

-

-/**

- * Find the line number and column for 'pos' within 'string'.

- * Return a copy of the line which contains 'pos'.  Free the line with

- * free().

- * \param string  the program string

- * \param pos     the position within the string

- * \param line    returns the line number corresponding to 'pos'.

- * \param col     returns the column number corresponding to 'pos'.

- * \return copy of the line containing 'pos'.

- */

-const GLubyte *

-_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,

-                       GLint *line, GLint *col)

-{

-   const GLubyte *lineStart = string;

-   const GLubyte *p = string;

-   GLubyte *s;

-   int len;

-

-   *line = 1;

-

-   while (p != pos) {

-      if (*p == (GLubyte) '\n') {

-         (*line)++;

-         lineStart = p + 1;

-      }

-      p++;

-   }

-

-   *col = (pos - lineStart) + 1;

-

-   /* return copy of this line */

-   while (*p != 0 && *p != '\n')

-      p++;

-   len = p - lineStart;

-   s = (GLubyte *) malloc(len + 1);

-   memcpy(s, lineStart, len);

-   s[len] = 0;

-

-   return s;

-}

-

-

-/**

- * Initialize a new vertex/fragment program object.

- */

-static struct gl_program *

-_mesa_init_program_struct( struct gl_context *ctx, struct gl_program *prog,

-                           GLenum target, GLuint id)

-{

-   (void) ctx;

-   if (prog) {

-      GLuint i;

-      memset(prog, 0, sizeof(*prog));

-      prog->Id = id;

-      prog->Target = target;

-      prog->Resident = GL_TRUE;

-      prog->RefCount = 1;

-      prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB;

-

-      /* default mapping from samplers to texture units */

-      for (i = 0; i < MAX_SAMPLERS; i++)

-         prog->SamplerUnits[i] = i;

-   }

-

-   return prog;

-}

-

-

-/**

- * Initialize a new fragment program object.

- */

-struct gl_program *

-_mesa_init_fragment_program( struct gl_context *ctx, struct gl_fragment_program *prog,

-                             GLenum target, GLuint id)

-{

-   if (prog)

-      return _mesa_init_program_struct( ctx, &prog->Base, target, id );

-   else

-      return NULL;

-}

-

-

-/**

- * Initialize a new vertex program object.

- */

-struct gl_program *

-_mesa_init_vertex_program( struct gl_context *ctx, struct gl_vertex_program *prog,

-                           GLenum target, GLuint id)

-{

-   if (prog)

-      return _mesa_init_program_struct( ctx, &prog->Base, target, id );

-   else

-      return NULL;

-}

-

-

-/**

- * Initialize a new geometry program object.

- */

-struct gl_program *

-_mesa_init_geometry_program( struct gl_context *ctx, struct gl_geometry_program *prog,

-                             GLenum target, GLuint id)

-{

-   if (prog)

-      return _mesa_init_program_struct( ctx, &prog->Base, target, id );

-   else

-      return NULL;

-}

-

-

-/**

- * Allocate and initialize a new fragment/vertex program object but

- * don't put it into the program hash table.  Called via

- * ctx->Driver.NewProgram.  May be overridden (ie. replaced) by a

- * device driver function to implement OO deriviation with additional

- * types not understood by this function.

- *

- * \param ctx  context

- * \param id   program id/number

- * \param target  program target/type

- * \return  pointer to new program object

- */

-struct gl_program *

-_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id)

-{

-   struct gl_program *prog;

-   switch (target) {

-   case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */

-   case GL_VERTEX_STATE_PROGRAM_NV:

-      prog = _mesa_init_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program),

-                                       target, id );

-      break;

-   case GL_FRAGMENT_PROGRAM_NV:

-   case GL_FRAGMENT_PROGRAM_ARB:

-      prog =_mesa_init_fragment_program(ctx,

-                                         CALLOC_STRUCT(gl_fragment_program),

-                                         target, id );

-      break;

-   case MESA_GEOMETRY_PROGRAM:

-      prog = _mesa_init_geometry_program(ctx,

-                                         CALLOC_STRUCT(gl_geometry_program),

-                                         target, id);

-      break;

-   default:

-      _mesa_problem(ctx, "bad target in _mesa_new_program");

-      prog = NULL;

-   }

-   return prog;

-}

-

-

-/**

- * Delete a program and remove it from the hash table, ignoring the

- * reference count.

- * Called via ctx->Driver.DeleteProgram.  May be wrapped (OO deriviation)

- * by a device driver function.

- */

-void

-_mesa_delete_program(struct gl_context *ctx, struct gl_program *prog)

-{

-   (void) ctx;

-   ASSERT(prog);

-   ASSERT(prog->RefCount==0);

-

-   if (prog == &_mesa_DummyProgram)

-      return;

-

-   if (prog->String)

-      free(prog->String);

-

-   _mesa_free_instructions(prog->Instructions, prog->NumInstructions);

-

-   if (prog->Parameters) {

-      _mesa_free_parameter_list(prog->Parameters);

-   }

-   if (prog->Varying) {

-      _mesa_free_parameter_list(prog->Varying);

-   }

-   if (prog->Attributes) {

-      _mesa_free_parameter_list(prog->Attributes);

-   }

-

-   free(prog);

-}

-

-

-/**

- * Return the gl_program object for a given ID.

- * Basically just a wrapper for _mesa_HashLookup() to avoid a lot of

- * casts elsewhere.

- */

-struct gl_program *

-_mesa_lookup_program(struct gl_context *ctx, GLuint id)

-{

-   if (id)

-      return (struct gl_program *) _mesa_HashLookup(ctx->Shared->Programs, id);

-   else

-      return NULL;

-}

-

-

-/**

- * Reference counting for vertex/fragment programs

- */

-void

-_mesa_reference_program(struct gl_context *ctx,

-                        struct gl_program **ptr,

-                        struct gl_program *prog)

-{

-   assert(ptr);

-   if (*ptr && prog) {

-      /* sanity check */

-      if ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB)

-         ASSERT(prog->Target == GL_VERTEX_PROGRAM_ARB);

-      else if ((*ptr)->Target == GL_FRAGMENT_PROGRAM_ARB)

-         ASSERT(prog->Target == GL_FRAGMENT_PROGRAM_ARB ||

-                prog->Target == GL_FRAGMENT_PROGRAM_NV);

-      else if ((*ptr)->Target == MESA_GEOMETRY_PROGRAM)

-         ASSERT(prog->Target == MESA_GEOMETRY_PROGRAM);

-   }

-   if (*ptr == prog) {

-      return;  /* no change */

-   }

-   if (*ptr) {

-      GLboolean deleteFlag;

-

-      /*_glthread_LOCK_MUTEX((*ptr)->Mutex);*/

-#if 0

-      printf("Program %p ID=%u Target=%s  Refcount-- to %d\n",

-             *ptr, (*ptr)->Id,

-             ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB ? "VP" :

-              ((*ptr)->Target == MESA_GEOMETRY_PROGRAM ? "GP" : "FP")),

-             (*ptr)->RefCount - 1);

-#endif

-      ASSERT((*ptr)->RefCount > 0);

-      (*ptr)->RefCount--;

-

-      deleteFlag = ((*ptr)->RefCount == 0);

-      /*_glthread_UNLOCK_MUTEX((*ptr)->Mutex);*/

-

-      if (deleteFlag) {

-         ASSERT(ctx);

-         ctx->Driver.DeleteProgram(ctx, *ptr);

-      }

-

-      *ptr = NULL;

-   }

-

-   assert(!*ptr);

-   if (prog) {

-      /*_glthread_LOCK_MUTEX(prog->Mutex);*/

-      prog->RefCount++;

-#if 0

-      printf("Program %p ID=%u Target=%s  Refcount++ to %d\n",

-             prog, prog->Id,

-             (prog->Target == GL_VERTEX_PROGRAM_ARB ? "VP" :

-              (prog->Target == MESA_GEOMETRY_PROGRAM ? "GP" : "FP")),

-             prog->RefCount);

-#endif

-      /*_glthread_UNLOCK_MUTEX(prog->Mutex);*/

-   }

-

-   *ptr = prog;

-}

-

-

-/**

- * Return a copy of a program.

- * XXX Problem here if the program object is actually OO-derivation

- * made by a device driver.

- */

-struct gl_program *

-_mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog)

-{

-   struct gl_program *clone;

-

-   clone = ctx->Driver.NewProgram(ctx, prog->Target, prog->Id);

-   if (!clone)

-      return NULL;

-

-   assert(clone->Target == prog->Target);

-   assert(clone->RefCount == 1);

-

-   clone->String = (GLubyte *) _mesa_strdup((char *) prog->String);

-   clone->Format = prog->Format;

-   clone->Instructions = _mesa_alloc_instructions(prog->NumInstructions);

-   if (!clone->Instructions) {

-      _mesa_reference_program(ctx, &clone, NULL);

-      return NULL;

-   }

-   _mesa_copy_instructions(clone->Instructions, prog->Instructions,

-                           prog->NumInstructions);

-   clone->InputsRead = prog->InputsRead;

-   clone->OutputsWritten = prog->OutputsWritten;

-   clone->SamplersUsed = prog->SamplersUsed;

-   clone->ShadowSamplers = prog->ShadowSamplers;

-   memcpy(clone->TexturesUsed, prog->TexturesUsed, sizeof(prog->TexturesUsed));

-

-   if (prog->Parameters)

-      clone->Parameters = _mesa_clone_parameter_list(prog->Parameters);

-   memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));

-   if (prog->Varying)

-      clone->Varying = _mesa_clone_parameter_list(prog->Varying);

-   if (prog->Attributes)

-      clone->Attributes = _mesa_clone_parameter_list(prog->Attributes);

-   memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));

-   clone->IndirectRegisterFiles = prog->IndirectRegisterFiles;

-   clone->NumInstructions = prog->NumInstructions;

-   clone->NumTemporaries = prog->NumTemporaries;

-   clone->NumParameters = prog->NumParameters;

-   clone->NumAttributes = prog->NumAttributes;

-   clone->NumAddressRegs = prog->NumAddressRegs;

-   clone->NumNativeInstructions = prog->NumNativeInstructions;

-   clone->NumNativeTemporaries = prog->NumNativeTemporaries;

-   clone->NumNativeParameters = prog->NumNativeParameters;

-   clone->NumNativeAttributes = prog->NumNativeAttributes;

-   clone->NumNativeAddressRegs = prog->NumNativeAddressRegs;

-   clone->NumAluInstructions = prog->NumAluInstructions;

-   clone->NumTexInstructions = prog->NumTexInstructions;

-   clone->NumTexIndirections = prog->NumTexIndirections;

-   clone->NumNativeAluInstructions = prog->NumNativeAluInstructions;

-   clone->NumNativeTexInstructions = prog->NumNativeTexInstructions;

-   clone->NumNativeTexIndirections = prog->NumNativeTexIndirections;

-

-   switch (prog->Target) {

-   case GL_VERTEX_PROGRAM_ARB:

-      {

-         const struct gl_vertex_program *vp

-            = (const struct gl_vertex_program *) prog;

-         struct gl_vertex_program *vpc = (struct gl_vertex_program *) clone;

-         vpc->IsPositionInvariant = vp->IsPositionInvariant;

-         vpc->IsNVProgram = vp->IsNVProgram;

-      }

-      break;

-   case GL_FRAGMENT_PROGRAM_ARB:

-      {

-         const struct gl_fragment_program *fp

-            = (const struct gl_fragment_program *) prog;

-         struct gl_fragment_program *fpc = (struct gl_fragment_program *) clone;

-         fpc->FogOption = fp->FogOption;

-         fpc->UsesKill = fp->UsesKill;

-         fpc->OriginUpperLeft = fp->OriginUpperLeft;

-         fpc->PixelCenterInteger = fp->PixelCenterInteger;

-      }

-      break;

-   case MESA_GEOMETRY_PROGRAM:

-      {

-         const struct gl_geometry_program *gp

-            = (const struct gl_geometry_program *) prog;

-         struct gl_geometry_program *gpc = (struct gl_geometry_program *) clone;

-         gpc->VerticesOut = gp->VerticesOut;

-         gpc->InputType = gp->InputType;

-         gpc->OutputType = gp->OutputType;

-      }

-      break;

-   default:

-      _mesa_problem(NULL, "Unexpected target in _mesa_clone_program");

-   }

-

-   return clone;

-}

-

-

-/**

- * Insert 'count' NOP instructions at 'start' in the given program.

- * Adjust branch targets accordingly.

- */

-GLboolean

-_mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count)

-{

-   const GLuint origLen = prog->NumInstructions;

-   const GLuint newLen = origLen + count;

-   struct prog_instruction *newInst;

-   GLuint i;

-

-   /* adjust branches */

-   for (i = 0; i < prog->NumInstructions; i++) {

-      struct prog_instruction *inst = prog->Instructions + i;

-      if (inst->BranchTarget > 0) {

-         if ((GLuint)inst->BranchTarget >= start) {

-            inst->BranchTarget += count;

-         }

-      }

-   }

-

-   /* Alloc storage for new instructions */

-   newInst = _mesa_alloc_instructions(newLen);

-   if (!newInst) {

-      return GL_FALSE;

-   }

-

-   /* Copy 'start' instructions into new instruction buffer */

-   _mesa_copy_instructions(newInst, prog->Instructions, start);

-

-   /* init the new instructions */

-   _mesa_init_instructions(newInst + start, count);

-

-   /* Copy the remaining/tail instructions to new inst buffer */

-   _mesa_copy_instructions(newInst + start + count,

-                           prog->Instructions + start,

-                           origLen - start);

-

-   /* free old instructions */

-   _mesa_free_instructions(prog->Instructions, origLen);

-

-   /* install new instructions */

-   prog->Instructions = newInst;

-   prog->NumInstructions = newLen;

-

-   return GL_TRUE;

-}

-

-/**

- * Delete 'count' instructions at 'start' in the given program.

- * Adjust branch targets accordingly.

- */

-GLboolean

-_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count)

-{

-   const GLuint origLen = prog->NumInstructions;

-   const GLuint newLen = origLen - count;

-   struct prog_instruction *newInst;

-   GLuint i;

-

-   /* adjust branches */

-   for (i = 0; i < prog->NumInstructions; i++) {

-      struct prog_instruction *inst = prog->Instructions + i;

-      if (inst->BranchTarget > 0) {

-         if (inst->BranchTarget > (GLint) start) {

-            inst->BranchTarget -= count;

-         }

-      }

-   }

-

-   /* Alloc storage for new instructions */

-   newInst = _mesa_alloc_instructions(newLen);

-   if (!newInst) {

-      return GL_FALSE;

-   }

-

-   /* Copy 'start' instructions into new instruction buffer */

-   _mesa_copy_instructions(newInst, prog->Instructions, start);

-

-   /* Copy the remaining/tail instructions to new inst buffer */

-   _mesa_copy_instructions(newInst + start,

-                           prog->Instructions + start + count,

-                           newLen - start);

-

-   /* free old instructions */

-   _mesa_free_instructions(prog->Instructions, origLen);

-

-   /* install new instructions */

-   prog->Instructions = newInst;

-   prog->NumInstructions = newLen;

-

-   return GL_TRUE;

-}

-

-

-/**

- * Search instructions for registers that match (oldFile, oldIndex),

- * replacing them with (newFile, newIndex).

- */

-static void

-replace_registers(struct prog_instruction *inst, GLuint numInst,

-                  GLuint oldFile, GLuint oldIndex,

-                  GLuint newFile, GLuint newIndex)

-{

-   GLuint i, j;

-   for (i = 0; i < numInst; i++) {

-      /* src regs */

-      for (j = 0; j < _mesa_num_inst_src_regs(inst[i].Opcode); j++) {

-         if (inst[i].SrcReg[j].File == oldFile &&

-             inst[i].SrcReg[j].Index == oldIndex) {

-            inst[i].SrcReg[j].File = newFile;

-            inst[i].SrcReg[j].Index = newIndex;

-         }

-      }

-      /* dst reg */

-      if (inst[i].DstReg.File == oldFile && inst[i].DstReg.Index == oldIndex) {

-         inst[i].DstReg.File = newFile;

-         inst[i].DstReg.Index = newIndex;

-      }

-   }

-}

-

-

-/**

- * Search instructions for references to program parameters.  When found,

- * increment the parameter index by 'offset'.

- * Used when combining programs.

- */

-static void

-adjust_param_indexes(struct prog_instruction *inst, GLuint numInst,

-                     GLuint offset)

-{

-   GLuint i, j;

-   for (i = 0; i < numInst; i++) {

-      for (j = 0; j < _mesa_num_inst_src_regs(inst[i].Opcode); j++) {

-         GLuint f = inst[i].SrcReg[j].File;

-         if (f == PROGRAM_CONSTANT ||

-             f == PROGRAM_UNIFORM ||

-             f == PROGRAM_STATE_VAR) {

-            inst[i].SrcReg[j].Index += offset;

-         }

-      }

-   }

-}

-

-

-/**

- * Combine two programs into one.  Fix instructions so the outputs of

- * the first program go to the inputs of the second program.

- */

-struct gl_program *

-_mesa_combine_programs(struct gl_context *ctx,

-                       const struct gl_program *progA,

-                       const struct gl_program *progB)

-{

-   struct prog_instruction *newInst;

-   struct gl_program *newProg;

-   const GLuint lenA = progA->NumInstructions - 1; /* omit END instr */

-   const GLuint lenB = progB->NumInstructions;

-   const GLuint numParamsA = _mesa_num_parameters(progA->Parameters);

-   const GLuint newLength = lenA + lenB;

-   GLboolean usedTemps[MAX_PROGRAM_TEMPS];

-   GLuint firstTemp = 0;

-   GLbitfield inputsB;

-   GLuint i;

-

-   ASSERT(progA->Target == progB->Target);

-

-   newInst = _mesa_alloc_instructions(newLength);

-   if (!newInst)

-      return GL_FALSE;

-

-   _mesa_copy_instructions(newInst, progA->Instructions, lenA);

-   _mesa_copy_instructions(newInst + lenA, progB->Instructions, lenB);

-

-   /* adjust branch / instruction addresses for B's instructions */

-   for (i = 0; i < lenB; i++) {

-      newInst[lenA + i].BranchTarget += lenA;

-   }

-

-   newProg = ctx->Driver.NewProgram(ctx, progA->Target, 0);

-   newProg->Instructions = newInst;

-   newProg->NumInstructions = newLength;

-

-   /* find used temp regs (we may need new temps below) */

-   _mesa_find_used_registers(newProg, PROGRAM_TEMPORARY,

-                             usedTemps, MAX_PROGRAM_TEMPS);

-

-   if (newProg->Target == GL_FRAGMENT_PROGRAM_ARB) {

-      struct gl_fragment_program *fprogA, *fprogB, *newFprog;

-      GLbitfield progB_inputsRead = progB->InputsRead;

-      GLint progB_colorFile, progB_colorIndex;

-

-      fprogA = (struct gl_fragment_program *) progA;

-      fprogB = (struct gl_fragment_program *) progB;

-      newFprog = (struct gl_fragment_program *) newProg;

-

-      newFprog->UsesKill = fprogA->UsesKill || fprogB->UsesKill;

-

-      /* We'll do a search and replace for instances

-       * of progB_colorFile/progB_colorIndex below...

-       */

-      progB_colorFile = PROGRAM_INPUT;

-      progB_colorIndex = FRAG_ATTRIB_COL0;

-

-      /*

-       * The fragment program may get color from a state var rather than

-       * a fragment input (vertex output) if it's constant.

-       * See the texenvprogram.c code.

-       * So, search the program's parameter list now to see if the program

-       * gets color from a state var instead of a conventional fragment

-       * input register.

-       */

-      for (i = 0; i < progB->Parameters->NumParameters; i++) {

-         struct gl_program_parameter *p = &progB->Parameters->Parameters[i];

-         if (p->Type == PROGRAM_STATE_VAR &&

-             p->StateIndexes[0] == STATE_INTERNAL &&

-             p->StateIndexes[1] == STATE_CURRENT_ATTRIB &&

-             (int) p->StateIndexes[2] == (int) VERT_ATTRIB_COLOR0) {

-            progB_inputsRead |= FRAG_BIT_COL0;

-            progB_colorFile = PROGRAM_STATE_VAR;

-            progB_colorIndex = i;

-            break;

-         }

-      }

-

-      /* Connect color outputs of fprogA to color inputs of fprogB, via a

-       * new temporary register.

-       */

-      if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) &&

-          (progB_inputsRead & FRAG_BIT_COL0)) {

-         GLint tempReg = _mesa_find_free_register(usedTemps, MAX_PROGRAM_TEMPS,

-                                                  firstTemp);

-         if (tempReg < 0) {

-            _mesa_problem(ctx, "No free temp regs found in "

-                          "_mesa_combine_programs(), using 31");

-            tempReg = 31;

-         }

-         firstTemp = tempReg + 1;

-

-         /* replace writes to result.color[0] with tempReg */

-         replace_registers(newInst, lenA,

-                           PROGRAM_OUTPUT, FRAG_RESULT_COLOR,

-                           PROGRAM_TEMPORARY, tempReg);

-         /* replace reads from the input color with tempReg */

-         replace_registers(newInst + lenA, lenB,

-                           progB_colorFile, progB_colorIndex, /* search for */

-                           PROGRAM_TEMPORARY, tempReg  /* replace with */ );

-      }

-

-      /* compute combined program's InputsRead */

-      inputsB = progB_inputsRead;

-      if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) {

-         inputsB &= ~(1 << FRAG_ATTRIB_COL0);

-      }

-      newProg->InputsRead = progA->InputsRead | inputsB;

-      newProg->OutputsWritten = progB->OutputsWritten;

-      newProg->SamplersUsed = progA->SamplersUsed | progB->SamplersUsed;

-   }

-   else {

-      /* vertex program */

-      assert(0);      /* XXX todo */

-   }

-

-   /*

-    * Merge parameters (uniforms, constants, etc)

-    */

-   newProg->Parameters = _mesa_combine_parameter_lists(progA->Parameters,

-                                                       progB->Parameters);

-

-   adjust_param_indexes(newInst + lenA, lenB, numParamsA);

-

-

-   return newProg;

-}

-

-

-/**

- * Populate the 'used' array with flags indicating which registers (TEMPs,

- * INPUTs, OUTPUTs, etc, are used by the given program.

- * \param file  type of register to scan for

- * \param used  returns true/false flags for in use / free

- * \param usedSize  size of the 'used' array

- */

-void

-_mesa_find_used_registers(const struct gl_program *prog,

-                          gl_register_file file,

-                          GLboolean used[], GLuint usedSize)

-{

-   GLuint i, j;

-

-   memset(used, 0, usedSize);

-

-   for (i = 0; i < prog->NumInstructions; i++) {

-      const struct prog_instruction *inst = prog->Instructions + i;

-      const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);

-

-      if (inst->DstReg.File == file) {

-         ASSERT(inst->DstReg.Index < usedSize);

-         if(inst->DstReg.Index < usedSize)

-            used[inst->DstReg.Index] = GL_TRUE;

-      }

-

-      for (j = 0; j < n; j++) {

-         if (inst->SrcReg[j].File == file) {

-            ASSERT(inst->SrcReg[j].Index < usedSize);

-            if(inst->SrcReg[j].Index < usedSize)

-               used[inst->SrcReg[j].Index] = GL_TRUE;

-         }

-      }

-   }

-}

-

-

-/**

- * Scan the given 'used' register flag array for the first entry

- * that's >= firstReg.

- * \param used  vector of flags indicating registers in use (as returned

- *              by _mesa_find_used_registers())

- * \param usedSize  size of the 'used' array

- * \param firstReg  first register to start searching at

- * \return index of unused register, or -1 if none.

- */

-GLint

-_mesa_find_free_register(const GLboolean used[],

-                         GLuint usedSize, GLuint firstReg)

-{

-   GLuint i;

-

-   assert(firstReg < usedSize);

-

-   for (i = firstReg; i < usedSize; i++)

-      if (!used[i])

-         return i;

-

-   return -1;

-}

-

-

-

-/**

- * Check if the given register index is valid (doesn't exceed implementation-

- * dependent limits).

- * \return GL_TRUE if OK, GL_FALSE if bad index

- */

-GLboolean

-_mesa_valid_register_index(const struct gl_context *ctx,

-                           gl_shader_type shaderType,

-                           gl_register_file file, GLint index)

-{

-   const struct gl_program_constants *c;

-

-   switch (shaderType) {

-   case MESA_SHADER_VERTEX:

-      c = &ctx->Const.VertexProgram;

-      break;

-   case MESA_SHADER_FRAGMENT:

-      c = &ctx->Const.FragmentProgram;

-      break;

-   case MESA_SHADER_GEOMETRY:

-      c = &ctx->Const.GeometryProgram;

-      break;

-   default:

-      _mesa_problem(ctx,

-                    "unexpected shader type in _mesa_valid_register_index()");

-      return GL_FALSE;

-   }

-

-   switch (file) {

-   case PROGRAM_UNDEFINED:

-      return GL_TRUE;  /* XXX or maybe false? */

-

-   case PROGRAM_TEMPORARY:

-      return index >= 0 && index < c->MaxTemps;

-

-   case PROGRAM_ENV_PARAM:

-      return index >= 0 && index < c->MaxEnvParams;

-

-   case PROGRAM_LOCAL_PARAM:

-      return index >= 0 && index < c->MaxLocalParams;

-

-   case PROGRAM_NAMED_PARAM:

-      return index >= 0 && index < c->MaxParameters;

-

-   case PROGRAM_UNIFORM:

-   case PROGRAM_STATE_VAR:

-      /* aka constant buffer */

-      return index >= 0 && index < c->MaxUniformComponents / 4;

-

-   case PROGRAM_CONSTANT:

-      /* constant buffer w/ possible relative negative addressing */

-      return (index > (int) c->MaxUniformComponents / -4 &&

-              index < c->MaxUniformComponents / 4);

-

-   case PROGRAM_INPUT:

-      if (index < 0)

-         return GL_FALSE;

-

-      switch (shaderType) {

-      case MESA_SHADER_VERTEX:

-         return index < VERT_ATTRIB_GENERIC0 + c->MaxAttribs;

-      case MESA_SHADER_FRAGMENT:

-         return index < FRAG_ATTRIB_VAR0 + ctx->Const.MaxVarying;

-      case MESA_SHADER_GEOMETRY:

-         return index < GEOM_ATTRIB_VAR0 + ctx->Const.MaxVarying;

-      default:

-         return GL_FALSE;

-      }

-

-   case PROGRAM_OUTPUT:

-      if (index < 0)

-         return GL_FALSE;

-

-      switch (shaderType) {

-      case MESA_SHADER_VERTEX:

-         return index < VERT_RESULT_VAR0 + ctx->Const.MaxVarying;

-      case MESA_SHADER_FRAGMENT:

-         return index < FRAG_RESULT_DATA0 + ctx->Const.MaxDrawBuffers;

-      case MESA_SHADER_GEOMETRY:

-         return index < GEOM_RESULT_VAR0 + ctx->Const.MaxVarying;

-      default:

-         return GL_FALSE;

-      }

-

-   case PROGRAM_ADDRESS:

-      return index >= 0 && index < c->MaxAddressRegs;

-

-   default:

-      _mesa_problem(ctx,

-                    "unexpected register file in _mesa_valid_register_index()");

-      return GL_FALSE;

-   }

-}

-

-

-

-/**

- * "Post-process" a GPU program.  This is intended to be used for debugging.

- * Example actions include no-op'ing instructions or changing instruction

- * behaviour.

- */

-void

-_mesa_postprocess_program(struct gl_context *ctx, struct gl_program *prog)

-{

-   static const GLfloat white[4] = { 0.5, 0.5, 0.5, 0.5 };

-   GLuint i;

-   GLuint whiteSwizzle;

-   GLint whiteIndex = _mesa_add_unnamed_constant(prog->Parameters,

-                                                 white, 4, &whiteSwizzle);

-

-   (void) whiteIndex;

-

-   for (i = 0; i < prog->NumInstructions; i++) {

-      struct prog_instruction *inst = prog->Instructions + i;

-      const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);

-

-      (void) n;

-

-      if (_mesa_is_tex_instruction(inst->Opcode)) {

-#if 0

-         /* replace TEX/TXP/TXB with MOV */

-         inst->Opcode = OPCODE_MOV;

-         inst->DstReg.WriteMask = WRITEMASK_XYZW;

-         inst->SrcReg[0].Swizzle = SWIZZLE_XYZW;

-         inst->SrcReg[0].Negate = NEGATE_NONE;

-#endif

-

-#if 0

-         /* disable shadow texture mode */

-         inst->TexShadow = 0;

-#endif

-      }

-

-      if (inst->Opcode == OPCODE_TXP) {

-#if 0

-         inst->Opcode = OPCODE_MOV;

-         inst->DstReg.WriteMask = WRITEMASK_XYZW;

-         inst->SrcReg[0].File = PROGRAM_CONSTANT;

-         inst->SrcReg[0].Index = whiteIndex;

-         inst->SrcReg[0].Swizzle = SWIZZLE_XYZW;

-         inst->SrcReg[0].Negate = NEGATE_NONE;

-#endif

-#if 0

-         inst->TexShadow = 0;

-#endif

-#if 0

-         inst->Opcode = OPCODE_TEX;

-         inst->TexShadow = 0;

-#endif

-      }

-

-   }

-}

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5.3
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
+ * \file program.c
+ * Vertex and fragment program support functions.
+ * \author Brian Paul
+ */
+
+
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/hash.h"
+#include "main/mfeatures.h"
+#include "program.h"
+#include "prog_cache.h"
+#include "prog_parameter.h"
+#include "prog_instruction.h"
+
+
+/**
+ * A pointer to this dummy program is put into the hash table when
+ * glGenPrograms is called.
+ */
+struct gl_program _mesa_DummyProgram;
+
+
+/**
+ * Init context's vertex/fragment program state
+ */
+void
+_mesa_init_program(struct gl_context *ctx)
+{
+   GLuint i;
+
+   /*
+    * If this assertion fails, we need to increase the field
+    * size for register indexes (see INST_INDEX_BITS).
+    */
+   ASSERT(ctx->Const.VertexProgram.MaxUniformComponents / 4
+          <= (1 << INST_INDEX_BITS));
+   ASSERT(ctx->Const.FragmentProgram.MaxUniformComponents / 4
+          <= (1 << INST_INDEX_BITS));
+
+   ASSERT(ctx->Const.VertexProgram.MaxTemps <= (1 << INST_INDEX_BITS));
+   ASSERT(ctx->Const.VertexProgram.MaxLocalParams <= (1 << INST_INDEX_BITS));
+   ASSERT(ctx->Const.FragmentProgram.MaxTemps <= (1 << INST_INDEX_BITS));
+   ASSERT(ctx->Const.FragmentProgram.MaxLocalParams <= (1 << INST_INDEX_BITS));
+
+   ASSERT(ctx->Const.VertexProgram.MaxUniformComponents <= 4 * MAX_UNIFORMS);
+   ASSERT(ctx->Const.FragmentProgram.MaxUniformComponents <= 4 * MAX_UNIFORMS);
+
+   ASSERT(ctx->Const.VertexProgram.MaxAddressOffset <= (1 << INST_INDEX_BITS));
+   ASSERT(ctx->Const.FragmentProgram.MaxAddressOffset <= (1 << INST_INDEX_BITS));
+
+   /* If this fails, increase prog_instruction::TexSrcUnit size */
+   ASSERT(MAX_TEXTURE_UNITS < (1 << 5));
+
+   /* If this fails, increase prog_instruction::TexSrcTarget size */
+   ASSERT(NUM_TEXTURE_TARGETS < (1 << 3));
+
+   ctx->Program.ErrorPos = -1;
+   ctx->Program.ErrorString = _mesa_strdup("");
+
+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
+   ctx->VertexProgram.Enabled = GL_FALSE;
+#if FEATURE_es2_glsl
+   ctx->VertexProgram.PointSizeEnabled =
+      (ctx->API == API_OPENGLES2) ? GL_TRUE : GL_FALSE;
+#else
+   ctx->VertexProgram.PointSizeEnabled = GL_FALSE;
+#endif
+   ctx->VertexProgram.TwoSideEnabled = GL_FALSE;
+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
+                            ctx->Shared->DefaultVertexProgram);
+   assert(ctx->VertexProgram.Current);
+   for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {
+      ctx->VertexProgram.TrackMatrix[i] = GL_NONE;
+      ctx->VertexProgram.TrackMatrixTransform[i] = GL_IDENTITY_NV;
+   }
+   ctx->VertexProgram.Cache = _mesa_new_program_cache();
+#endif
+
+#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
+   ctx->FragmentProgram.Enabled = GL_FALSE;
+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
+                            ctx->Shared->DefaultFragmentProgram);
+   assert(ctx->FragmentProgram.Current);
+   ctx->FragmentProgram.Cache = _mesa_new_program_cache();
+#endif
+
+#if FEATURE_ARB_geometry_shader4
+   ctx->GeometryProgram.Enabled = GL_FALSE;
+   /* right now by default we don't have a geometry program */
+   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,
+                            NULL);
+   ctx->GeometryProgram.Cache = _mesa_new_program_cache();
+#endif
+
+   /* XXX probably move this stuff */
+#if FEATURE_ATI_fragment_shader
+   ctx->ATIFragmentShader.Enabled = GL_FALSE;
+   ctx->ATIFragmentShader.Current = ctx->Shared->DefaultFragmentShader;
+   assert(ctx->ATIFragmentShader.Current);
+   ctx->ATIFragmentShader.Current->RefCount++;
+#endif
+}
+
+
+/**
+ * Free a context's vertex/fragment program state
+ */
+void
+_mesa_free_program_data(struct gl_context *ctx)
+{
+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current, NULL);
+   _mesa_delete_program_cache(ctx, ctx->VertexProgram.Cache);
+#endif
+#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, NULL);
+   _mesa_delete_program_cache(ctx, ctx->FragmentProgram.Cache);
+#endif
+#if FEATURE_ARB_geometry_shader4
+   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current, NULL);
+   _mesa_delete_program_cache(ctx, ctx->GeometryProgram.Cache);
+#endif
+   /* XXX probably move this stuff */
+#if FEATURE_ATI_fragment_shader
+   if (ctx->ATIFragmentShader.Current) {
+      ctx->ATIFragmentShader.Current->RefCount--;
+      if (ctx->ATIFragmentShader.Current->RefCount <= 0) {
+         free(ctx->ATIFragmentShader.Current);
+      }
+   }
+#endif
+   free((void *) ctx->Program.ErrorString);
+}
+
+
+/**
+ * Update the default program objects in the given context to reference those
+ * specified in the shared state and release those referencing the old
+ * shared state.
+ */
+void
+_mesa_update_default_objects_program(struct gl_context *ctx)
+{
+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
+                            (struct gl_vertex_program *)
+                            ctx->Shared->DefaultVertexProgram);
+   assert(ctx->VertexProgram.Current);
+#endif
+
+#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
+                            (struct gl_fragment_program *)
+                            ctx->Shared->DefaultFragmentProgram);
+   assert(ctx->FragmentProgram.Current);
+#endif
+
+#if FEATURE_ARB_geometry_shader4
+   _mesa_reference_geomprog(ctx, &ctx->GeometryProgram.Current,
+                            (struct gl_geometry_program *)
+                            ctx->Shared->DefaultGeometryProgram);
+#endif
+
+   /* XXX probably move this stuff */
+#if FEATURE_ATI_fragment_shader
+   if (ctx->ATIFragmentShader.Current) {
+      ctx->ATIFragmentShader.Current->RefCount--;
+      if (ctx->ATIFragmentShader.Current->RefCount <= 0) {
+         free(ctx->ATIFragmentShader.Current);
+      }
+   }
+   ctx->ATIFragmentShader.Current = (struct ati_fragment_shader *) ctx->Shared->DefaultFragmentShader;
+   assert(ctx->ATIFragmentShader.Current);
+   ctx->ATIFragmentShader.Current->RefCount++;
+#endif
+}
+
+
+/**
+ * Set the vertex/fragment program error state (position and error string).
+ * This is generally called from within the parsers.
+ */
+void
+_mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string)
+{
+   ctx->Program.ErrorPos = pos;
+   free((void *) ctx->Program.ErrorString);
+   if (!string)
+      string = "";
+   ctx->Program.ErrorString = _mesa_strdup(string);
+}
+
+
+/**
+ * Find the line number and column for 'pos' within 'string'.
+ * Return a copy of the line which contains 'pos'.  Free the line with
+ * free().
+ * \param string  the program string
+ * \param pos     the position within the string
+ * \param line    returns the line number corresponding to 'pos'.
+ * \param col     returns the column number corresponding to 'pos'.
+ * \return copy of the line containing 'pos'.
+ */
+const GLubyte *
+_mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
+                       GLint *line, GLint *col)
+{
+   const GLubyte *lineStart = string;
+   const GLubyte *p = string;
+   GLubyte *s;
+   int len;
+
+   *line = 1;
+
+   while (p != pos) {
+      if (*p == (GLubyte) '\n') {
+         (*line)++;
+         lineStart = p + 1;
+      }
+      p++;
+   }
+
+   *col = (pos - lineStart) + 1;
+
+   /* return copy of this line */
+   while (*p != 0 && *p != '\n')
+      p++;
+   len = p - lineStart;
+   s = (GLubyte *) malloc(len + 1);
+   memcpy(s, lineStart, len);
+   s[len] = 0;
+
+   return s;
+}
+
+
+/**
+ * Initialize a new vertex/fragment program object.
+ */
+static struct gl_program *
+_mesa_init_program_struct( struct gl_context *ctx, struct gl_program *prog,
+                           GLenum target, GLuint id)
+{
+   (void) ctx;
+   if (prog) {
+      GLuint i;
+      memset(prog, 0, sizeof(*prog));
+      prog->Id = id;
+      prog->Target = target;
+      prog->Resident = GL_TRUE;
+      prog->RefCount = 1;
+      prog->Format = GL_PROGRAM_FORMAT_ASCII_ARB;
+
+      /* default mapping from samplers to texture units */
+      for (i = 0; i < MAX_SAMPLERS; i++)
+         prog->SamplerUnits[i] = i;
+   }
+
+   return prog;
+}
+
+
+/**
+ * Initialize a new fragment program object.
+ */
+struct gl_program *
+_mesa_init_fragment_program( struct gl_context *ctx, struct gl_fragment_program *prog,
+                             GLenum target, GLuint id)
+{
+   if (prog)
+      return _mesa_init_program_struct( ctx, &prog->Base, target, id );
+   else
+      return NULL;
+}
+
+
+/**
+ * Initialize a new vertex program object.
+ */
+struct gl_program *
+_mesa_init_vertex_program( struct gl_context *ctx, struct gl_vertex_program *prog,
+                           GLenum target, GLuint id)
+{
+   if (prog)
+      return _mesa_init_program_struct( ctx, &prog->Base, target, id );
+   else
+      return NULL;
+}
+
+
+/**
+ * Initialize a new geometry program object.
+ */
+struct gl_program *
+_mesa_init_geometry_program( struct gl_context *ctx, struct gl_geometry_program *prog,
+                             GLenum target, GLuint id)
+{
+   if (prog)
+      return _mesa_init_program_struct( ctx, &prog->Base, target, id );
+   else
+      return NULL;
+}
+
+
+/**
+ * Allocate and initialize a new fragment/vertex program object but
+ * don't put it into the program hash table.  Called via
+ * ctx->Driver.NewProgram.  May be overridden (ie. replaced) by a
+ * device driver function to implement OO deriviation with additional
+ * types not understood by this function.
+ *
+ * \param ctx  context
+ * \param id   program id/number
+ * \param target  program target/type
+ * \return  pointer to new program object
+ */
+struct gl_program *
+_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id)
+{
+   struct gl_program *prog;
+   switch (target) {
+   case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
+   case GL_VERTEX_STATE_PROGRAM_NV:
+      prog = _mesa_init_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program),
+                                       target, id );
+      break;
+   case GL_FRAGMENT_PROGRAM_NV:
+   case GL_FRAGMENT_PROGRAM_ARB:
+      prog =_mesa_init_fragment_program(ctx,
+                                         CALLOC_STRUCT(gl_fragment_program),
+                                         target, id );
+      break;
+   case MESA_GEOMETRY_PROGRAM:
+      prog = _mesa_init_geometry_program(ctx,
+                                         CALLOC_STRUCT(gl_geometry_program),
+                                         target, id);
+      break;
+   default:
+      _mesa_problem(ctx, "bad target in _mesa_new_program");
+      prog = NULL;
+   }
+   return prog;
+}
+
+
+/**
+ * Delete a program and remove it from the hash table, ignoring the
+ * reference count.
+ * Called via ctx->Driver.DeleteProgram.  May be wrapped (OO deriviation)
+ * by a device driver function.
+ */
+void
+_mesa_delete_program(struct gl_context *ctx, struct gl_program *prog)
+{
+   (void) ctx;
+   ASSERT(prog);
+   ASSERT(prog->RefCount==0);
+
+   if (prog == &_mesa_DummyProgram)
+      return;
+
+   if (prog->String)
+      free(prog->String);
+
+   _mesa_free_instructions(prog->Instructions, prog->NumInstructions);
+
+   if (prog->Parameters) {
+      _mesa_free_parameter_list(prog->Parameters);
+   }
+   if (prog->Varying) {
+      _mesa_free_parameter_list(prog->Varying);
+   }
+   if (prog->Attributes) {
+      _mesa_free_parameter_list(prog->Attributes);
+   }
+
+   free(prog);
+}
+
+
+/**
+ * Return the gl_program object for a given ID.
+ * Basically just a wrapper for _mesa_HashLookup() to avoid a lot of
+ * casts elsewhere.
+ */
+struct gl_program *
+_mesa_lookup_program(struct gl_context *ctx, GLuint id)
+{
+   if (id)
+      return (struct gl_program *) _mesa_HashLookup(ctx->Shared->Programs, id);
+   else
+      return NULL;
+}
+
+
+/**
+ * Reference counting for vertex/fragment programs
+ */
+void
+_mesa_reference_program(struct gl_context *ctx,
+                        struct gl_program **ptr,
+                        struct gl_program *prog)
+{
+   assert(ptr);
+   if (*ptr && prog) {
+      /* sanity check */
+      if ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB)
+         ASSERT(prog->Target == GL_VERTEX_PROGRAM_ARB);
+      else if ((*ptr)->Target == GL_FRAGMENT_PROGRAM_ARB)
+         ASSERT(prog->Target == GL_FRAGMENT_PROGRAM_ARB ||
+                prog->Target == GL_FRAGMENT_PROGRAM_NV);
+      else if ((*ptr)->Target == MESA_GEOMETRY_PROGRAM)
+         ASSERT(prog->Target == MESA_GEOMETRY_PROGRAM);
+   }
+   if (*ptr == prog) {
+      return;  /* no change */
+   }
+   if (*ptr) {
+      GLboolean deleteFlag;
+
+      /*_glthread_LOCK_MUTEX((*ptr)->Mutex);*/
+#if 0
+      printf("Program %p ID=%u Target=%s  Refcount-- to %d\n",
+             *ptr, (*ptr)->Id,
+             ((*ptr)->Target == GL_VERTEX_PROGRAM_ARB ? "VP" :
+              ((*ptr)->Target == MESA_GEOMETRY_PROGRAM ? "GP" : "FP")),
+             (*ptr)->RefCount - 1);
+#endif
+      ASSERT((*ptr)->RefCount > 0);
+      (*ptr)->RefCount--;
+
+      deleteFlag = ((*ptr)->RefCount == 0);
+      /*_glthread_UNLOCK_MUTEX((*ptr)->Mutex);*/
+
+      if (deleteFlag) {
+         ASSERT(ctx);
+         ctx->Driver.DeleteProgram(ctx, *ptr);
+      }
+
+      *ptr = NULL;
+   }
+
+   assert(!*ptr);
+   if (prog) {
+      /*_glthread_LOCK_MUTEX(prog->Mutex);*/
+      prog->RefCount++;
+#if 0
+      printf("Program %p ID=%u Target=%s  Refcount++ to %d\n",
+             prog, prog->Id,
+             (prog->Target == GL_VERTEX_PROGRAM_ARB ? "VP" :
+              (prog->Target == MESA_GEOMETRY_PROGRAM ? "GP" : "FP")),
+             prog->RefCount);
+#endif
+      /*_glthread_UNLOCK_MUTEX(prog->Mutex);*/
+   }
+
+   *ptr = prog;
+}
+
+
+/**
+ * Return a copy of a program.
+ * XXX Problem here if the program object is actually OO-derivation
+ * made by a device driver.
+ */
+struct gl_program *
+_mesa_clone_program(struct gl_context *ctx, const struct gl_program *prog)
+{
+   struct gl_program *clone;
+
+   clone = ctx->Driver.NewProgram(ctx, prog->Target, prog->Id);
+   if (!clone)
+      return NULL;
+
+   assert(clone->Target == prog->Target);
+   assert(clone->RefCount == 1);
+
+   clone->String = (GLubyte *) _mesa_strdup((char *) prog->String);
+   clone->Format = prog->Format;
+   clone->Instructions = _mesa_alloc_instructions(prog->NumInstructions);
+   if (!clone->Instructions) {
+      _mesa_reference_program(ctx, &clone, NULL);
+      return NULL;
+   }
+   _mesa_copy_instructions(clone->Instructions, prog->Instructions,
+                           prog->NumInstructions);
+   clone->InputsRead = prog->InputsRead;
+   clone->OutputsWritten = prog->OutputsWritten;
+   clone->SamplersUsed = prog->SamplersUsed;
+   clone->ShadowSamplers = prog->ShadowSamplers;
+   memcpy(clone->TexturesUsed, prog->TexturesUsed, sizeof(prog->TexturesUsed));
+
+   if (prog->Parameters)
+      clone->Parameters = _mesa_clone_parameter_list(prog->Parameters);
+   memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));
+   if (prog->Varying)
+      clone->Varying = _mesa_clone_parameter_list(prog->Varying);
+   if (prog->Attributes)
+      clone->Attributes = _mesa_clone_parameter_list(prog->Attributes);
+   memcpy(clone->LocalParams, prog->LocalParams, sizeof(clone->LocalParams));
+   clone->IndirectRegisterFiles = prog->IndirectRegisterFiles;
+   clone->NumInstructions = prog->NumInstructions;
+   clone->NumTemporaries = prog->NumTemporaries;
+   clone->NumParameters = prog->NumParameters;
+   clone->NumAttributes = prog->NumAttributes;
+   clone->NumAddressRegs = prog->NumAddressRegs;
+   clone->NumNativeInstructions = prog->NumNativeInstructions;
+   clone->NumNativeTemporaries = prog->NumNativeTemporaries;
+   clone->NumNativeParameters = prog->NumNativeParameters;
+   clone->NumNativeAttributes = prog->NumNativeAttributes;
+   clone->NumNativeAddressRegs = prog->NumNativeAddressRegs;
+   clone->NumAluInstructions = prog->NumAluInstructions;
+   clone->NumTexInstructions = prog->NumTexInstructions;
+   clone->NumTexIndirections = prog->NumTexIndirections;
+   clone->NumNativeAluInstructions = prog->NumNativeAluInstructions;
+   clone->NumNativeTexInstructions = prog->NumNativeTexInstructions;
+   clone->NumNativeTexIndirections = prog->NumNativeTexIndirections;
+
+   switch (prog->Target) {
+   case GL_VERTEX_PROGRAM_ARB:
+      {
+         const struct gl_vertex_program *vp
+            = (const struct gl_vertex_program *) prog;
+         struct gl_vertex_program *vpc = (struct gl_vertex_program *) clone;
+         vpc->IsPositionInvariant = vp->IsPositionInvariant;
+         vpc->IsNVProgram = vp->IsNVProgram;
+      }
+      break;
+   case GL_FRAGMENT_PROGRAM_ARB:
+      {
+         const struct gl_fragment_program *fp
+            = (const struct gl_fragment_program *) prog;
+         struct gl_fragment_program *fpc = (struct gl_fragment_program *) clone;
+         fpc->FogOption = fp->FogOption;
+         fpc->UsesKill = fp->UsesKill;
+         fpc->OriginUpperLeft = fp->OriginUpperLeft;
+         fpc->PixelCenterInteger = fp->PixelCenterInteger;
+      }
+      break;
+   case MESA_GEOMETRY_PROGRAM:
+      {
+         const struct gl_geometry_program *gp
+            = (const struct gl_geometry_program *) prog;
+         struct gl_geometry_program *gpc = (struct gl_geometry_program *) clone;
+         gpc->VerticesOut = gp->VerticesOut;
+         gpc->InputType = gp->InputType;
+         gpc->OutputType = gp->OutputType;
+      }
+      break;
+   default:
+      _mesa_problem(NULL, "Unexpected target in _mesa_clone_program");
+   }
+
+   return clone;
+}
+
+
+/**
+ * Insert 'count' NOP instructions at 'start' in the given program.
+ * Adjust branch targets accordingly.
+ */
+GLboolean
+_mesa_insert_instructions(struct gl_program *prog, GLuint start, GLuint count)
+{
+   const GLuint origLen = prog->NumInstructions;
+   const GLuint newLen = origLen + count;
+   struct prog_instruction *newInst;
+   GLuint i;
+
+   /* adjust branches */
+   for (i = 0; i < prog->NumInstructions; i++) {
+      struct prog_instruction *inst = prog->Instructions + i;
+      if (inst->BranchTarget > 0) {
+         if ((GLuint)inst->BranchTarget >= start) {
+            inst->BranchTarget += count;
+         }
+      }
+   }
+
+   /* Alloc storage for new instructions */
+   newInst = _mesa_alloc_instructions(newLen);
+   if (!newInst) {
+      return GL_FALSE;
+   }
+
+   /* Copy 'start' instructions into new instruction buffer */
+   _mesa_copy_instructions(newInst, prog->Instructions, start);
+
+   /* init the new instructions */
+   _mesa_init_instructions(newInst + start, count);
+
+   /* Copy the remaining/tail instructions to new inst buffer */
+   _mesa_copy_instructions(newInst + start + count,
+                           prog->Instructions + start,
+                           origLen - start);
+
+   /* free old instructions */
+   _mesa_free_instructions(prog->Instructions, origLen);
+
+   /* install new instructions */
+   prog->Instructions = newInst;
+   prog->NumInstructions = newLen;
+
+   return GL_TRUE;
+}
+
+/**
+ * Delete 'count' instructions at 'start' in the given program.
+ * Adjust branch targets accordingly.
+ */
+GLboolean
+_mesa_delete_instructions(struct gl_program *prog, GLuint start, GLuint count)
+{
+   const GLuint origLen = prog->NumInstructions;
+   const GLuint newLen = origLen - count;
+   struct prog_instruction *newInst;
+   GLuint i;
+
+   /* adjust branches */
+   for (i = 0; i < prog->NumInstructions; i++) {
+      struct prog_instruction *inst = prog->Instructions + i;
+      if (inst->BranchTarget > 0) {
+         if (inst->BranchTarget > (GLint) start) {
+            inst->BranchTarget -= count;
+         }
+      }
+   }
+
+   /* Alloc storage for new instructions */
+   newInst = _mesa_alloc_instructions(newLen);
+   if (!newInst) {
+      return GL_FALSE;
+   }
+
+   /* Copy 'start' instructions into new instruction buffer */
+   _mesa_copy_instructions(newInst, prog->Instructions, start);
+
+   /* Copy the remaining/tail instructions to new inst buffer */
+   _mesa_copy_instructions(newInst + start,
+                           prog->Instructions + start + count,
+                           newLen - start);
+
+   /* free old instructions */
+   _mesa_free_instructions(prog->Instructions, origLen);
+
+   /* install new instructions */
+   prog->Instructions = newInst;
+   prog->NumInstructions = newLen;
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Search instructions for registers that match (oldFile, oldIndex),
+ * replacing them with (newFile, newIndex).
+ */
+static void
+replace_registers(struct prog_instruction *inst, GLuint numInst,
+                  GLuint oldFile, GLuint oldIndex,
+                  GLuint newFile, GLuint newIndex)
+{
+   GLuint i, j;
+   for (i = 0; i < numInst; i++) {
+      /* src regs */
+      for (j = 0; j < _mesa_num_inst_src_regs(inst[i].Opcode); j++) {
+         if (inst[i].SrcReg[j].File == oldFile &&
+             inst[i].SrcReg[j].Index == oldIndex) {
+            inst[i].SrcReg[j].File = newFile;
+            inst[i].SrcReg[j].Index = newIndex;
+         }
+      }
+      /* dst reg */
+      if (inst[i].DstReg.File == oldFile && inst[i].DstReg.Index == oldIndex) {
+         inst[i].DstReg.File = newFile;
+         inst[i].DstReg.Index = newIndex;
+      }
+   }
+}
+
+
+/**
+ * Search instructions for references to program parameters.  When found,
+ * increment the parameter index by 'offset'.
+ * Used when combining programs.
+ */
+static void
+adjust_param_indexes(struct prog_instruction *inst, GLuint numInst,
+                     GLuint offset)
+{
+   GLuint i, j;
+   for (i = 0; i < numInst; i++) {
+      for (j = 0; j < _mesa_num_inst_src_regs(inst[i].Opcode); j++) {
+         GLuint f = inst[i].SrcReg[j].File;
+         if (f == PROGRAM_CONSTANT ||
+             f == PROGRAM_UNIFORM ||
+             f == PROGRAM_STATE_VAR) {
+            inst[i].SrcReg[j].Index += offset;
+         }
+      }
+   }
+}
+
+
+/**
+ * Combine two programs into one.  Fix instructions so the outputs of
+ * the first program go to the inputs of the second program.
+ */
+struct gl_program *
+_mesa_combine_programs(struct gl_context *ctx,
+                       const struct gl_program *progA,
+                       const struct gl_program *progB)
+{
+   struct prog_instruction *newInst;
+   struct gl_program *newProg;
+   const GLuint lenA = progA->NumInstructions - 1; /* omit END instr */
+   const GLuint lenB = progB->NumInstructions;
+   const GLuint numParamsA = _mesa_num_parameters(progA->Parameters);
+   const GLuint newLength = lenA + lenB;
+   GLboolean usedTemps[MAX_PROGRAM_TEMPS];
+   GLuint firstTemp = 0;
+   GLbitfield inputsB;
+   GLuint i;
+
+   ASSERT(progA->Target == progB->Target);
+
+   newInst = _mesa_alloc_instructions(newLength);
+   if (!newInst)
+      return GL_FALSE;
+
+   _mesa_copy_instructions(newInst, progA->Instructions, lenA);
+   _mesa_copy_instructions(newInst + lenA, progB->Instructions, lenB);
+
+   /* adjust branch / instruction addresses for B's instructions */
+   for (i = 0; i < lenB; i++) {
+      newInst[lenA + i].BranchTarget += lenA;
+   }
+
+   newProg = ctx->Driver.NewProgram(ctx, progA->Target, 0);
+   newProg->Instructions = newInst;
+   newProg->NumInstructions = newLength;
+
+   /* find used temp regs (we may need new temps below) */
+   _mesa_find_used_registers(newProg, PROGRAM_TEMPORARY,
+                             usedTemps, MAX_PROGRAM_TEMPS);
+
+   if (newProg->Target == GL_FRAGMENT_PROGRAM_ARB) {
+      struct gl_fragment_program *fprogA, *fprogB, *newFprog;
+      GLbitfield progB_inputsRead = progB->InputsRead;
+      GLint progB_colorFile, progB_colorIndex;
+
+      fprogA = (struct gl_fragment_program *) progA;
+      fprogB = (struct gl_fragment_program *) progB;
+      newFprog = (struct gl_fragment_program *) newProg;
+
+      newFprog->UsesKill = fprogA->UsesKill || fprogB->UsesKill;
+
+      /* We'll do a search and replace for instances
+       * of progB_colorFile/progB_colorIndex below...
+       */
+      progB_colorFile = PROGRAM_INPUT;
+      progB_colorIndex = FRAG_ATTRIB_COL0;
+
+      /*
+       * The fragment program may get color from a state var rather than
+       * a fragment input (vertex output) if it's constant.
+       * See the texenvprogram.c code.
+       * So, search the program's parameter list now to see if the program
+       * gets color from a state var instead of a conventional fragment
+       * input register.
+       */
+      for (i = 0; i < progB->Parameters->NumParameters; i++) {
+         struct gl_program_parameter *p = &progB->Parameters->Parameters[i];
+         if (p->Type == PROGRAM_STATE_VAR &&
+             p->StateIndexes[0] == STATE_INTERNAL &&
+             p->StateIndexes[1] == STATE_CURRENT_ATTRIB &&
+             (int) p->StateIndexes[2] == (int) VERT_ATTRIB_COLOR0) {
+            progB_inputsRead |= FRAG_BIT_COL0;
+            progB_colorFile = PROGRAM_STATE_VAR;
+            progB_colorIndex = i;
+            break;
+         }
+      }
+
+      /* Connect color outputs of fprogA to color inputs of fprogB, via a
+       * new temporary register.
+       */
+      if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) &&
+          (progB_inputsRead & FRAG_BIT_COL0)) {
+         GLint tempReg = _mesa_find_free_register(usedTemps, MAX_PROGRAM_TEMPS,
+                                                  firstTemp);
+         if (tempReg < 0) {
+            _mesa_problem(ctx, "No free temp regs found in "
+                          "_mesa_combine_programs(), using 31");
+            tempReg = 31;
+         }
+         firstTemp = tempReg + 1;
+
+         /* replace writes to result.color[0] with tempReg */
+         replace_registers(newInst, lenA,
+                           PROGRAM_OUTPUT, FRAG_RESULT_COLOR,
+                           PROGRAM_TEMPORARY, tempReg);
+         /* replace reads from the input color with tempReg */
+         replace_registers(newInst + lenA, lenB,
+                           progB_colorFile, progB_colorIndex, /* search for */
+                           PROGRAM_TEMPORARY, tempReg  /* replace with */ );
+      }
+
+      /* compute combined program's InputsRead */
+      inputsB = progB_inputsRead;
+      if (progA->OutputsWritten & (1 << FRAG_RESULT_COLOR)) {
+         inputsB &= ~(1 << FRAG_ATTRIB_COL0);
+      }
+      newProg->InputsRead = progA->InputsRead | inputsB;
+      newProg->OutputsWritten = progB->OutputsWritten;
+      newProg->SamplersUsed = progA->SamplersUsed | progB->SamplersUsed;
+   }
+   else {
+      /* vertex program */
+      assert(0);      /* XXX todo */
+   }
+
+   /*
+    * Merge parameters (uniforms, constants, etc)
+    */
+   newProg->Parameters = _mesa_combine_parameter_lists(progA->Parameters,
+                                                       progB->Parameters);
+
+   adjust_param_indexes(newInst + lenA, lenB, numParamsA);
+
+
+   return newProg;
+}
+
+
+/**
+ * Populate the 'used' array with flags indicating which registers (TEMPs,
+ * INPUTs, OUTPUTs, etc, are used by the given program.
+ * \param file  type of register to scan for
+ * \param used  returns true/false flags for in use / free
+ * \param usedSize  size of the 'used' array
+ */
+void
+_mesa_find_used_registers(const struct gl_program *prog,
+                          gl_register_file file,
+                          GLboolean used[], GLuint usedSize)
+{
+   GLuint i, j;
+
+   memset(used, 0, usedSize);
+
+   for (i = 0; i < prog->NumInstructions; i++) {
+      const struct prog_instruction *inst = prog->Instructions + i;
+      const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);
+
+      if (inst->DstReg.File == file) {
+         ASSERT(inst->DstReg.Index < usedSize);
+         if(inst->DstReg.Index < usedSize)
+            used[inst->DstReg.Index] = GL_TRUE;
+      }
+
+      for (j = 0; j < n; j++) {
+         if (inst->SrcReg[j].File == file) {
+            ASSERT(inst->SrcReg[j].Index < usedSize);
+            if(inst->SrcReg[j].Index < usedSize)
+               used[inst->SrcReg[j].Index] = GL_TRUE;
+         }
+      }
+   }
+}
+
+
+/**
+ * Scan the given 'used' register flag array for the first entry
+ * that's >= firstReg.
+ * \param used  vector of flags indicating registers in use (as returned
+ *              by _mesa_find_used_registers())
+ * \param usedSize  size of the 'used' array
+ * \param firstReg  first register to start searching at
+ * \return index of unused register, or -1 if none.
+ */
+GLint
+_mesa_find_free_register(const GLboolean used[],
+                         GLuint usedSize, GLuint firstReg)
+{
+   GLuint i;
+
+   assert(firstReg < usedSize);
+
+   for (i = firstReg; i < usedSize; i++)
+      if (!used[i])
+         return i;
+
+   return -1;
+}
+
+
+
+/**
+ * Check if the given register index is valid (doesn't exceed implementation-
+ * dependent limits).
+ * \return GL_TRUE if OK, GL_FALSE if bad index
+ */
+GLboolean
+_mesa_valid_register_index(const struct gl_context *ctx,
+                           gl_shader_type shaderType,
+                           gl_register_file file, GLint index)
+{
+   const struct gl_program_constants *c;
+
+   switch (shaderType) {
+   case MESA_SHADER_VERTEX:
+      c = &ctx->Const.VertexProgram;
+      break;
+   case MESA_SHADER_FRAGMENT:
+      c = &ctx->Const.FragmentProgram;
+      break;
+   case MESA_SHADER_GEOMETRY:
+      c = &ctx->Const.GeometryProgram;
+      break;
+   default:
+      _mesa_problem(ctx,
+                    "unexpected shader type in _mesa_valid_register_index()");
+      return GL_FALSE;
+   }
+
+   switch (file) {
+   case PROGRAM_UNDEFINED:
+      return GL_TRUE;  /* XXX or maybe false? */
+
+   case PROGRAM_TEMPORARY:
+      return index >= 0 && index < c->MaxTemps;
+
+   case PROGRAM_ENV_PARAM:
+      return index >= 0 && index < c->MaxEnvParams;
+
+   case PROGRAM_LOCAL_PARAM:
+      return index >= 0 && index < c->MaxLocalParams;
+
+   case PROGRAM_NAMED_PARAM:
+      return index >= 0 && index < c->MaxParameters;
+
+   case PROGRAM_UNIFORM:
+   case PROGRAM_STATE_VAR:
+      /* aka constant buffer */
+      return index >= 0 && index < c->MaxUniformComponents / 4;
+
+   case PROGRAM_CONSTANT:
+      /* constant buffer w/ possible relative negative addressing */
+      return (index > (int) c->MaxUniformComponents / -4 &&
+              index < c->MaxUniformComponents / 4);
+
+   case PROGRAM_INPUT:
+      if (index < 0)
+         return GL_FALSE;
+
+      switch (shaderType) {
+      case MESA_SHADER_VERTEX:
+         return index < VERT_ATTRIB_GENERIC0 + c->MaxAttribs;
+      case MESA_SHADER_FRAGMENT:
+         return index < FRAG_ATTRIB_VAR0 + ctx->Const.MaxVarying;
+      case MESA_SHADER_GEOMETRY:
+         return index < GEOM_ATTRIB_VAR0 + ctx->Const.MaxVarying;
+      default:
+         return GL_FALSE;
+      }
+
+   case PROGRAM_OUTPUT:
+      if (index < 0)
+         return GL_FALSE;
+
+      switch (shaderType) {
+      case MESA_SHADER_VERTEX:
+         return index < VERT_RESULT_VAR0 + ctx->Const.MaxVarying;
+      case MESA_SHADER_FRAGMENT:
+         return index < FRAG_RESULT_DATA0 + ctx->Const.MaxDrawBuffers;
+      case MESA_SHADER_GEOMETRY:
+         return index < GEOM_RESULT_VAR0 + ctx->Const.MaxVarying;
+      default:
+         return GL_FALSE;
+      }
+
+   case PROGRAM_ADDRESS:
+      return index >= 0 && index < c->MaxAddressRegs;
+
+   default:
+      _mesa_problem(ctx,
+                    "unexpected register file in _mesa_valid_register_index()");
+      return GL_FALSE;
+   }
+}
+
+
+
+/**
+ * "Post-process" a GPU program.  This is intended to be used for debugging.
+ * Example actions include no-op'ing instructions or changing instruction
+ * behaviour.
+ */
+void
+_mesa_postprocess_program(struct gl_context *ctx, struct gl_program *prog)
+{
+   static const GLfloat white[4] = { 0.5, 0.5, 0.5, 0.5 };
+   GLuint i;
+   GLuint whiteSwizzle;
+   GLint whiteIndex = _mesa_add_unnamed_constant(prog->Parameters,
+                                                 white, 4, &whiteSwizzle);
+
+   (void) whiteIndex;
+
+   for (i = 0; i < prog->NumInstructions; i++) {
+      struct prog_instruction *inst = prog->Instructions + i;
+      const GLuint n = _mesa_num_inst_src_regs(inst->Opcode);
+
+      (void) n;
+
+      if (_mesa_is_tex_instruction(inst->Opcode)) {
+#if 0
+         /* replace TEX/TXP/TXB with MOV */
+         inst->Opcode = OPCODE_MOV;
+         inst->DstReg.WriteMask = WRITEMASK_XYZW;
+         inst->SrcReg[0].Swizzle = SWIZZLE_XYZW;
+         inst->SrcReg[0].Negate = NEGATE_NONE;
+#endif
+
+#if 0
+         /* disable shadow texture mode */
+         inst->TexShadow = 0;
+#endif
+      }
+
+      if (inst->Opcode == OPCODE_TXP) {
+#if 0
+         inst->Opcode = OPCODE_MOV;
+         inst->DstReg.WriteMask = WRITEMASK_XYZW;
+         inst->SrcReg[0].File = PROGRAM_CONSTANT;
+         inst->SrcReg[0].Index = whiteIndex;
+         inst->SrcReg[0].Swizzle = SWIZZLE_XYZW;
+         inst->SrcReg[0].Negate = NEGATE_NONE;
+#endif
+#if 0
+         inst->TexShadow = 0;
+#endif
+#if 0
+         inst->Opcode = OPCODE_TEX;
+         inst->TexShadow = 0;
+#endif
+      }
+
+   }
+}
diff --git a/mesalib/src/mesa/program/program_parse.y b/mesalib/src/mesa/program/program_parse.y
index a85977e2e..19aa8ccdb 100644
--- a/mesalib/src/mesa/program/program_parse.y
+++ b/mesalib/src/mesa/program/program_parse.y
@@ -1,2768 +1,2768 @@
-%{

-/*

- * Copyright © 2009 Intel Corporation

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice (including the next

- * paragraph) shall be included in all copies or substantial portions of the

- * Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- */

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

-#include "main/mtypes.h"

-#include "main/imports.h"

-#include "program/program.h"

-#include "program/prog_parameter.h"

-#include "program/prog_parameter_layout.h"

-#include "program/prog_statevars.h"

-#include "program/prog_instruction.h"

-

-#include "program/symbol_table.h"

-#include "program/program_parser.h"

-

-extern void *yy_scan_string(char *);

-extern void yy_delete_buffer(void *);

-

-static struct asm_symbol *declare_variable(struct asm_parser_state *state,

-    char *name, enum asm_type t, struct YYLTYPE *locp);

-

-static int add_state_reference(struct gl_program_parameter_list *param_list,

-    const gl_state_index tokens[STATE_LENGTH]);

-

-static int initialize_symbol_from_state(struct gl_program *prog,

-    struct asm_symbol *param_var, const gl_state_index tokens[STATE_LENGTH]);

-

-static int initialize_symbol_from_param(struct gl_program *prog,

-    struct asm_symbol *param_var, const gl_state_index tokens[STATE_LENGTH]);

-

-static int initialize_symbol_from_const(struct gl_program *prog,

-    struct asm_symbol *param_var, const struct asm_vector *vec,

-    GLboolean allowSwizzle);

-

-static int yyparse(struct asm_parser_state *state);

-

-static char *make_error_string(const char *fmt, ...);

-

-static void yyerror(struct YYLTYPE *locp, struct asm_parser_state *state,

-    const char *s);

-

-static int validate_inputs(struct YYLTYPE *locp,

-    struct asm_parser_state *state);

-

-static void init_dst_reg(struct prog_dst_register *r);

-

-static void set_dst_reg(struct prog_dst_register *r,

-                        gl_register_file file, GLint index);

-

-static void init_src_reg(struct asm_src_register *r);

-

-static void set_src_reg(struct asm_src_register *r,

-                        gl_register_file file, GLint index);

-

-static void set_src_reg_swz(struct asm_src_register *r,

-                            gl_register_file file, GLint index, GLuint swizzle);

-

-static void asm_instruction_set_operands(struct asm_instruction *inst,

-    const struct prog_dst_register *dst, const struct asm_src_register *src0,

-    const struct asm_src_register *src1, const struct asm_src_register *src2);

-

-static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,

-    const struct prog_dst_register *dst, const struct asm_src_register *src0,

-    const struct asm_src_register *src1, const struct asm_src_register *src2);

-

-static struct asm_instruction *asm_instruction_copy_ctor(

-    const struct prog_instruction *base, const struct prog_dst_register *dst,

-    const struct asm_src_register *src0, const struct asm_src_register *src1,

-    const struct asm_src_register *src2);

-

-#ifndef FALSE

-#define FALSE 0

-#define TRUE (!FALSE)

-#endif

-

-#define YYLLOC_DEFAULT(Current, Rhs, N)					\

-   do {									\

-      if (YYID(N)) {							\

-	 (Current).first_line = YYRHSLOC(Rhs, 1).first_line;		\

-	 (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\

-	 (Current).position = YYRHSLOC(Rhs, 1).position;		\

-	 (Current).last_line = YYRHSLOC(Rhs, N).last_line;		\

-	 (Current).last_column = YYRHSLOC(Rhs, N).last_column;		\

-      } else {								\

-	 (Current).first_line = YYRHSLOC(Rhs, 0).last_line;		\

-	 (Current).last_line = (Current).first_line;			\

-	 (Current).first_column = YYRHSLOC(Rhs, 0).last_column;		\

-	 (Current).last_column = (Current).first_column;		\

-	 (Current).position = YYRHSLOC(Rhs, 0).position			\

-	    + (Current).first_column;					\

-      }									\

-   } while(YYID(0))

-

-#define YYLEX_PARAM state->scanner

-%}

-

-%pure-parser

-%locations

-%parse-param { struct asm_parser_state *state }

-%error-verbose

-%lex-param { void *scanner }

-

-%union {

-   struct asm_instruction *inst;

-   struct asm_symbol *sym;

-   struct asm_symbol temp_sym;

-   struct asm_swizzle_mask swiz_mask;

-   struct asm_src_register src_reg;

-   struct prog_dst_register dst_reg;

-   struct prog_instruction temp_inst;

-   char *string;

-   unsigned result;

-   unsigned attrib;

-   int integer;

-   float real;

-   gl_state_index state[STATE_LENGTH];

-   int negate;

-   struct asm_vector vector;

-   gl_inst_opcode opcode;

-

-   struct {

-      unsigned swz;

-      unsigned rgba_valid:1;

-      unsigned xyzw_valid:1;

-      unsigned negate:1;

-   } ext_swizzle;

-}

-

-%token ARBvp_10 ARBfp_10

-

-/* Tokens for assembler pseudo-ops */

-%token <integer> ADDRESS

-%token ALIAS ATTRIB

-%token OPTION OUTPUT

-%token PARAM

-%token <integer> TEMP

-%token END

-

- /* Tokens for instructions */

-%token <temp_inst> BIN_OP BINSC_OP SAMPLE_OP SCALAR_OP TRI_OP VECTOR_OP

-%token <temp_inst> ARL KIL SWZ TXD_OP

-

-%token <integer> INTEGER

-%token <real> REAL

-

-%token AMBIENT ATTENUATION

-%token BACK

-%token CLIP COLOR

-%token DEPTH DIFFUSE DIRECTION

-%token EMISSION ENV EYE

-%token FOG FOGCOORD FRAGMENT FRONT

-%token HALF

-%token INVERSE INVTRANS

-%token LIGHT LIGHTMODEL LIGHTPROD LOCAL

-%token MATERIAL MAT_PROGRAM MATRIX MATRIXINDEX MODELVIEW MVP

-%token NORMAL

-%token OBJECT

-%token PALETTE PARAMS PLANE POINT_TOK POINTSIZE POSITION PRIMARY PROGRAM PROJECTION

-%token RANGE RESULT ROW

-%token SCENECOLOR SECONDARY SHININESS SIZE_TOK SPECULAR SPOT STATE

-%token TEXCOORD TEXENV TEXGEN TEXGEN_Q TEXGEN_R TEXGEN_S TEXGEN_T TEXTURE TRANSPOSE

-%token TEXTURE_UNIT TEX_1D TEX_2D TEX_3D TEX_CUBE TEX_RECT

-%token TEX_SHADOW1D TEX_SHADOW2D TEX_SHADOWRECT

-%token TEX_ARRAY1D TEX_ARRAY2D TEX_ARRAYSHADOW1D TEX_ARRAYSHADOW2D 

-%token VERTEX VTXATTRIB

-%token WEIGHT

-

-%token <string> IDENTIFIER USED_IDENTIFIER

-%type <string> string

-%token <swiz_mask> MASK4 MASK3 MASK2 MASK1 SWIZZLE

-%token DOT_DOT

-%token DOT

-

-%type <inst> instruction ALU_instruction TexInstruction

-%type <inst> ARL_instruction VECTORop_instruction

-%type <inst> SCALARop_instruction BINSCop_instruction BINop_instruction

-%type <inst> TRIop_instruction TXD_instruction SWZ_instruction SAMPLE_instruction

-%type <inst> KIL_instruction

-

-%type <dst_reg> dstReg maskedDstReg maskedAddrReg

-%type <src_reg> srcReg scalarUse scalarSrcReg swizzleSrcReg

-%type <swiz_mask> scalarSuffix swizzleSuffix extendedSwizzle

-%type <ext_swizzle> extSwizComp extSwizSel

-%type <swiz_mask> optionalMask

-

-%type <sym> progParamArray

-%type <integer> addrRegRelOffset addrRegPosOffset addrRegNegOffset

-%type <src_reg> progParamArrayMem progParamArrayAbs progParamArrayRel

-%type <sym> addrReg

-%type <swiz_mask> addrComponent addrWriteMask

-

-%type <dst_reg> ccMaskRule ccTest ccMaskRule2 ccTest2 optionalCcMask

-

-%type <result> resultBinding resultColBinding

-%type <integer> optFaceType optColorType

-%type <integer> optResultFaceType optResultColorType

-

-%type <integer> optTexImageUnitNum texImageUnitNum

-%type <integer> optTexCoordUnitNum texCoordUnitNum

-%type <integer> optLegacyTexUnitNum legacyTexUnitNum

-%type <integer> texImageUnit texTarget

-%type <integer> vtxAttribNum

-

-%type <attrib> attribBinding vtxAttribItem fragAttribItem

-

-%type <temp_sym> paramSingleInit paramSingleItemDecl

-%type <integer> optArraySize

-

-%type <state> stateSingleItem stateMultipleItem

-%type <state> stateMaterialItem

-%type <state> stateLightItem stateLightModelItem stateLightProdItem

-%type <state> stateTexGenItem stateFogItem stateClipPlaneItem statePointItem

-%type <state> stateMatrixItem stateMatrixRow stateMatrixRows

-%type <state> stateTexEnvItem stateDepthItem

-

-%type <state> stateLModProperty

-%type <state> stateMatrixName optMatrixRows

-

-%type <integer> stateMatProperty

-%type <integer> stateLightProperty stateSpotProperty

-%type <integer> stateLightNumber stateLProdProperty

-%type <integer> stateTexGenType stateTexGenCoord

-%type <integer> stateTexEnvProperty

-%type <integer> stateFogProperty

-%type <integer> stateClipPlaneNum

-%type <integer> statePointProperty

-

-%type <integer> stateOptMatModifier stateMatModifier stateMatrixRowNum

-%type <integer> stateOptModMatNum stateModMatNum statePaletteMatNum 

-%type <integer> stateProgramMatNum

-

-%type <integer> ambDiffSpecProperty

-

-%type <state> programSingleItem progEnvParam progLocalParam

-%type <state> programMultipleItem progEnvParams progLocalParams

-

-%type <temp_sym> paramMultipleInit paramMultInitList paramMultipleItem

-%type <temp_sym> paramSingleItemUse

-

-%type <integer> progEnvParamNum progLocalParamNum

-%type <state> progEnvParamNums progLocalParamNums

-

-%type <vector> paramConstDecl paramConstUse

-%type <vector> paramConstScalarDecl paramConstScalarUse paramConstVector

-%type <real> signedFloatConstant

-%type <negate> optionalSign

-

-%{

-extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,

-    void *yyscanner);

-%}

-

-%%

-

-program: language optionSequence statementSequence END

-	;

-

-language: ARBvp_10

-	{

-	   if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {

-	      yyerror(& @1, state, "invalid fragment program header");

-

-	   }

-	   state->mode = ARB_vertex;

-	}

-	| ARBfp_10

-	{

-	   if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {

-	      yyerror(& @1, state, "invalid vertex program header");

-	   }

-	   state->mode = ARB_fragment;

-

-	   state->option.TexRect =

-	      (state->ctx->Extensions.NV_texture_rectangle != GL_FALSE);

-	}

-	;

-

-optionSequence: optionSequence option

-	|

-	;

-

-option: OPTION string ';'

-	{

-	   int valid = 0;

-

-	   if (state->mode == ARB_vertex) {

-	      valid = _mesa_ARBvp_parse_option(state, $2);

-	   } else if (state->mode == ARB_fragment) {

-	      valid = _mesa_ARBfp_parse_option(state, $2);

-	   }

-

-

-	   free($2);

-

-	   if (!valid) {

-	      const char *const err_str = (state->mode == ARB_vertex)

-		 ? "invalid ARB vertex program option"

-		 : "invalid ARB fragment program option";

-

-	      yyerror(& @2, state, err_str);

-	      YYERROR;

-	   }

-	}

-	;

-

-statementSequence: statementSequence statement

-	|

-	;

-

-statement: instruction ';'

-	{

-	   if ($1 != NULL) {

-	      if (state->inst_tail == NULL) {

-		 state->inst_head = $1;

-	      } else {

-		 state->inst_tail->next = $1;

-	      }

-

-	      state->inst_tail = $1;

-	      $1->next = NULL;

-

-	      state->prog->NumInstructions++;

-	   }

-	}

-	| namingStatement ';'

-	;

-

-instruction: ALU_instruction

-	{

-	   $$ = $1;

-	   state->prog->NumAluInstructions++;

-	}

-	| TexInstruction

-	{

-	   $$ = $1;

-	   state->prog->NumTexInstructions++;

-	}

-	;

-

-ALU_instruction: ARL_instruction

-	| VECTORop_instruction

-	| SCALARop_instruction

-	| BINSCop_instruction

-	| BINop_instruction

-	| TRIop_instruction

-	| SWZ_instruction

-	;

-

-TexInstruction: SAMPLE_instruction

-	| KIL_instruction

-	| TXD_instruction

-	;

-

-ARL_instruction: ARL maskedAddrReg ',' scalarSrcReg

-	{

-	   $$ = asm_instruction_ctor(OPCODE_ARL, & $2, & $4, NULL, NULL);

-	}

-	;

-

-VECTORop_instruction: VECTOR_OP maskedDstReg ',' swizzleSrcReg

-	{

-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);

-	}

-	;

-

-SCALARop_instruction: SCALAR_OP maskedDstReg ',' scalarSrcReg

-	{

-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);

-	}

-	;

-

-BINSCop_instruction: BINSC_OP maskedDstReg ',' scalarSrcReg ',' scalarSrcReg

-	{

-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, NULL);

-	}

-	;

-

-

-BINop_instruction: BIN_OP maskedDstReg ',' swizzleSrcReg ',' swizzleSrcReg

-	{

-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, NULL);

-	}

-	;

-

-TRIop_instruction: TRI_OP maskedDstReg ','

-                   swizzleSrcReg ',' swizzleSrcReg ',' swizzleSrcReg

-	{

-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, & $8);

-	}

-	;

-

-SAMPLE_instruction: SAMPLE_OP maskedDstReg ',' swizzleSrcReg ',' texImageUnit ',' texTarget

-	{

-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);

-	   if ($$ != NULL) {

-	      const GLbitfield tex_mask = (1U << $6);

-	      GLbitfield shadow_tex = 0;

-	      GLbitfield target_mask = 0;

-

-

-	      $$->Base.TexSrcUnit = $6;

-

-	      if ($8 < 0) {

-		 shadow_tex = tex_mask;

-

-		 $$->Base.TexSrcTarget = -$8;

-		 $$->Base.TexShadow = 1;

-	      } else {

-		 $$->Base.TexSrcTarget = $8;

-	      }

-

-	      target_mask = (1U << $$->Base.TexSrcTarget);

-

-	      /* If this texture unit was previously accessed and that access

-	       * had a different texture target, generate an error.

-	       *

-	       * If this texture unit was previously accessed and that access

-	       * had a different shadow mode, generate an error.

-	       */

-	      if ((state->prog->TexturesUsed[$6] != 0)

-		  && ((state->prog->TexturesUsed[$6] != target_mask)

-		      || ((state->prog->ShadowSamplers & tex_mask)

-			  != shadow_tex))) {

-		 yyerror(& @8, state,

-			 "multiple targets used on one texture image unit");

-		 YYERROR;

-	      }

-

-

-	      state->prog->TexturesUsed[$6] |= target_mask;

-	      state->prog->ShadowSamplers |= shadow_tex;

-	   }

-	}

-	;

-

-KIL_instruction: KIL swizzleSrcReg

-	{

-	   $$ = asm_instruction_ctor(OPCODE_KIL, NULL, & $2, NULL, NULL);

-	   state->fragment.UsesKill = 1;

-	}

-	| KIL ccTest

-	{

-	   $$ = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);

-	   $$->Base.DstReg.CondMask = $2.CondMask;

-	   $$->Base.DstReg.CondSwizzle = $2.CondSwizzle;

-	   $$->Base.DstReg.CondSrc = $2.CondSrc;

-	   state->fragment.UsesKill = 1;

-	}

-	;

-

-TXD_instruction: TXD_OP maskedDstReg ',' swizzleSrcReg ',' swizzleSrcReg ',' swizzleSrcReg ',' texImageUnit ',' texTarget

-	{

-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, & $8);

-	   if ($$ != NULL) {

-	      const GLbitfield tex_mask = (1U << $10);

-	      GLbitfield shadow_tex = 0;

-	      GLbitfield target_mask = 0;

-

-

-	      $$->Base.TexSrcUnit = $10;

-

-	      if ($12 < 0) {

-		 shadow_tex = tex_mask;

-

-		 $$->Base.TexSrcTarget = -$12;

-		 $$->Base.TexShadow = 1;

-	      } else {

-		 $$->Base.TexSrcTarget = $12;

-	      }

-

-	      target_mask = (1U << $$->Base.TexSrcTarget);

-

-	      /* If this texture unit was previously accessed and that access

-	       * had a different texture target, generate an error.

-	       *

-	       * If this texture unit was previously accessed and that access

-	       * had a different shadow mode, generate an error.

-	       */

-	      if ((state->prog->TexturesUsed[$10] != 0)

-		  && ((state->prog->TexturesUsed[$10] != target_mask)

-		      || ((state->prog->ShadowSamplers & tex_mask)

-			  != shadow_tex))) {

-		 yyerror(& @12, state,

-			 "multiple targets used on one texture image unit");

-		 YYERROR;

-	      }

-

-

-	      state->prog->TexturesUsed[$10] |= target_mask;

-	      state->prog->ShadowSamplers |= shadow_tex;

-	   }

-	}

-	;

-

-texImageUnit: TEXTURE_UNIT optTexImageUnitNum

-	{

-	   $$ = $2;

-	}

-	;

-

-texTarget: TEX_1D  { $$ = TEXTURE_1D_INDEX; }

-	| TEX_2D   { $$ = TEXTURE_2D_INDEX; }

-	| TEX_3D   { $$ = TEXTURE_3D_INDEX; }

-	| TEX_CUBE { $$ = TEXTURE_CUBE_INDEX; }

-	| TEX_RECT { $$ = TEXTURE_RECT_INDEX; }

-	| TEX_SHADOW1D   { $$ = -TEXTURE_1D_INDEX; }

-	| TEX_SHADOW2D   { $$ = -TEXTURE_2D_INDEX; }

-	| TEX_SHADOWRECT { $$ = -TEXTURE_RECT_INDEX; }

-	| TEX_ARRAY1D         { $$ = TEXTURE_1D_ARRAY_INDEX; }

-	| TEX_ARRAY2D         { $$ = TEXTURE_2D_ARRAY_INDEX; }

-	| TEX_ARRAYSHADOW1D   { $$ = -TEXTURE_1D_ARRAY_INDEX; }

-	| TEX_ARRAYSHADOW2D   { $$ = -TEXTURE_2D_ARRAY_INDEX; }

-	;

-

-SWZ_instruction: SWZ maskedDstReg ',' srcReg ',' extendedSwizzle

-	{

-	   /* FIXME: Is this correct?  Should the extenedSwizzle be applied

-	    * FIXME: to the existing swizzle?

-	    */

-	   $4.Base.Swizzle = $6.swizzle;

-	   $4.Base.Negate = $6.mask;

-

-	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);

-	}

-	;

-

-scalarSrcReg: optionalSign scalarUse

-	{

-	   $$ = $2;

-

-	   if ($1) {

-	      $$.Base.Negate = ~$$.Base.Negate;

-	   }

-	}

-	| optionalSign '|' scalarUse '|'

-	{

-	   $$ = $3;

-

-	   if (!state->option.NV_fragment) {

-	      yyerror(& @2, state, "unexpected character '|'");

-	      YYERROR;

-	   }

-

-	   if ($1) {

-	      $$.Base.Negate = ~$$.Base.Negate;

-	   }

-

-	   $$.Base.Abs = 1;

-	}

-	;

-

-scalarUse:  srcReg scalarSuffix

-	{

-	   $$ = $1;

-

-	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,

-						    $2.swizzle);

-	}

-	| paramConstScalarUse

-	{

-	   struct asm_symbol temp_sym;

-

-	   if (!state->option.NV_fragment) {

-	      yyerror(& @1, state, "expected scalar suffix");

-	      YYERROR;

-	   }

-

-	   memset(& temp_sym, 0, sizeof(temp_sym));

-	   temp_sym.param_binding_begin = ~0;

-	   initialize_symbol_from_const(state->prog, & temp_sym, & $1, GL_TRUE);

-

-	   set_src_reg_swz(& $$, PROGRAM_CONSTANT,

-                           temp_sym.param_binding_begin,

-                           temp_sym.param_binding_swizzle);

-	}

-	;

-

-swizzleSrcReg: optionalSign srcReg swizzleSuffix

-	{

-	   $$ = $2;

-

-	   if ($1) {

-	      $$.Base.Negate = ~$$.Base.Negate;

-	   }

-

-	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,

-						    $3.swizzle);

-	}

-	| optionalSign '|' srcReg swizzleSuffix '|'

-	{

-	   $$ = $3;

-

-	   if (!state->option.NV_fragment) {

-	      yyerror(& @2, state, "unexpected character '|'");

-	      YYERROR;

-	   }

-

-	   if ($1) {

-	      $$.Base.Negate = ~$$.Base.Negate;

-	   }

-

-	   $$.Base.Abs = 1;

-	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,

-						    $4.swizzle);

-	}

-

-	;

-

-maskedDstReg: dstReg optionalMask optionalCcMask

-	{

-	   $$ = $1;

-	   $$.WriteMask = $2.mask;

-	   $$.CondMask = $3.CondMask;

-	   $$.CondSwizzle = $3.CondSwizzle;

-	   $$.CondSrc = $3.CondSrc;

-

-	   if ($$.File == PROGRAM_OUTPUT) {

-	      /* Technically speaking, this should check that it is in

-	       * vertex program mode.  However, PositionInvariant can never be

-	       * set in fragment program mode, so it is somewhat irrelevant.

-	       */

-	      if (state->option.PositionInvariant

-	       && ($$.Index == VERT_RESULT_HPOS)) {

-		 yyerror(& @1, state, "position-invariant programs cannot "

-			 "write position");

-		 YYERROR;

-	      }

-

-	      state->prog->OutputsWritten |= BITFIELD64_BIT($$.Index);

-	   }

-	}

-	;

-

-maskedAddrReg: addrReg addrWriteMask

-	{

-	   set_dst_reg(& $$, PROGRAM_ADDRESS, 0);

-	   $$.WriteMask = $2.mask;

-	}

-	;

-

-extendedSwizzle: extSwizComp ',' extSwizComp ',' extSwizComp ',' extSwizComp

-	{

-	   const unsigned xyzw_valid =

-	      ($1.xyzw_valid << 0)

-	      | ($3.xyzw_valid << 1)

-	      | ($5.xyzw_valid << 2)

-	      | ($7.xyzw_valid << 3);

-	   const unsigned rgba_valid =

-	      ($1.rgba_valid << 0)

-	      | ($3.rgba_valid << 1)

-	      | ($5.rgba_valid << 2)

-	      | ($7.rgba_valid << 3);

-

-	   /* All of the swizzle components have to be valid in either RGBA

-	    * or XYZW.  Note that 0 and 1 are valid in both, so both masks

-	    * can have some bits set.

-	    *

-	    * We somewhat deviate from the spec here.  It would be really hard

-	    * to figure out which component is the error, and there probably

-	    * isn't a lot of benefit.

-	    */

-	   if ((rgba_valid != 0x0f) && (xyzw_valid != 0x0f)) {

-	      yyerror(& @1, state, "cannot combine RGBA and XYZW swizzle "

-		      "components");

-	      YYERROR;

-	   }

-

-	   $$.swizzle = MAKE_SWIZZLE4($1.swz, $3.swz, $5.swz, $7.swz);

-	   $$.mask = ($1.negate) | ($3.negate << 1) | ($5.negate << 2)

-	      | ($7.negate << 3);

-	}

-	;

-

-extSwizComp: optionalSign extSwizSel

-	{

-	   $$ = $2;

-	   $$.negate = ($1) ? 1 : 0;

-	}

-	;

-

-extSwizSel: INTEGER

-	{

-	   if (($1 != 0) && ($1 != 1)) {

-	      yyerror(& @1, state, "invalid extended swizzle selector");

-	      YYERROR;

-	   }

-

-	   $$.swz = ($1 == 0) ? SWIZZLE_ZERO : SWIZZLE_ONE;

-

-	   /* 0 and 1 are valid for both RGBA swizzle names and XYZW

-	    * swizzle names.

-	    */

-	   $$.xyzw_valid = 1;

-	   $$.rgba_valid = 1;

-	}

-	| string

-	{

-	   char s;

-

-	   if (strlen($1) > 1) {

-	      yyerror(& @1, state, "invalid extended swizzle selector");

-	      YYERROR;

-	   }

-

-	   s = $1[0];

-	   free($1);

-

-	   switch (s) {

-	   case 'x':

-	      $$.swz = SWIZZLE_X;

-	      $$.xyzw_valid = 1;

-	      break;

-	   case 'y':

-	      $$.swz = SWIZZLE_Y;

-	      $$.xyzw_valid = 1;

-	      break;

-	   case 'z':

-	      $$.swz = SWIZZLE_Z;

-	      $$.xyzw_valid = 1;

-	      break;

-	   case 'w':

-	      $$.swz = SWIZZLE_W;

-	      $$.xyzw_valid = 1;

-	      break;

-

-	   case 'r':

-	      $$.swz = SWIZZLE_X;

-	      $$.rgba_valid = 1;

-	      break;

-	   case 'g':

-	      $$.swz = SWIZZLE_Y;

-	      $$.rgba_valid = 1;

-	      break;

-	   case 'b':

-	      $$.swz = SWIZZLE_Z;

-	      $$.rgba_valid = 1;

-	      break;

-	   case 'a':

-	      $$.swz = SWIZZLE_W;

-	      $$.rgba_valid = 1;

-	      break;

-

-	   default:

-	      yyerror(& @1, state, "invalid extended swizzle selector");

-	      YYERROR;

-	      break;

-	   }

-	}

-	;

-

-srcReg: USED_IDENTIFIER /* temporaryReg | progParamSingle */

-	{

-	   struct asm_symbol *const s = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);

-

-	   free($1);

-

-	   if (s == NULL) {

-	      yyerror(& @1, state, "invalid operand variable");

-	      YYERROR;

-	   } else if ((s->type != at_param) && (s->type != at_temp)

-		      && (s->type != at_attrib)) {

-	      yyerror(& @1, state, "invalid operand variable");

-	      YYERROR;

-	   } else if ((s->type == at_param) && s->param_is_array) {

-	      yyerror(& @1, state, "non-array access to array PARAM");

-	      YYERROR;

-	   }

-

-	   init_src_reg(& $$);

-	   switch (s->type) {

-	   case at_temp:

-	      set_src_reg(& $$, PROGRAM_TEMPORARY, s->temp_binding);

-	      break;

-	   case at_param:

-              set_src_reg_swz(& $$, s->param_binding_type,

-                              s->param_binding_begin,

-                              s->param_binding_swizzle);

-	      break;

-	   case at_attrib:

-	      set_src_reg(& $$, PROGRAM_INPUT, s->attrib_binding);

-	      state->prog->InputsRead |= (1U << $$.Base.Index);

-

-	      if (!validate_inputs(& @1, state)) {

-		 YYERROR;

-	      }

-	      break;

-

-	   default:

-	      YYERROR;

-	      break;

-	   }

-	}

-	| attribBinding

-	{

-	   set_src_reg(& $$, PROGRAM_INPUT, $1);

-	   state->prog->InputsRead |= (1U << $$.Base.Index);

-

-	   if (!validate_inputs(& @1, state)) {

-	      YYERROR;

-	   }

-	}

-	| progParamArray '[' progParamArrayMem ']'

-	{

-	   if (! $3.Base.RelAddr

-	       && ((unsigned) $3.Base.Index >= $1->param_binding_length)) {

-	      yyerror(& @3, state, "out of bounds array access");

-	      YYERROR;

-	   }

-

-	   init_src_reg(& $$);

-	   $$.Base.File = $1->param_binding_type;

-

-	   if ($3.Base.RelAddr) {

-              state->prog->IndirectRegisterFiles |= (1 << $$.Base.File);

-	      $1->param_accessed_indirectly = 1;

-

-	      $$.Base.RelAddr = 1;

-	      $$.Base.Index = $3.Base.Index;

-	      $$.Symbol = $1;

-	   } else {

-	      $$.Base.Index = $1->param_binding_begin + $3.Base.Index;

-	   }

-	}

-	| paramSingleItemUse

-	{

-           gl_register_file file = ($1.name != NULL) 

-	      ? $1.param_binding_type

-	      : PROGRAM_CONSTANT;

-           set_src_reg_swz(& $$, file, $1.param_binding_begin,

-                           $1.param_binding_swizzle);

-	}

-	;

-

-dstReg: resultBinding

-	{

-	   set_dst_reg(& $$, PROGRAM_OUTPUT, $1);

-	}

-	| USED_IDENTIFIER /* temporaryReg | vertexResultReg */

-	{

-	   struct asm_symbol *const s = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);

-

-	   free($1);

-

-	   if (s == NULL) {

-	      yyerror(& @1, state, "invalid operand variable");

-	      YYERROR;

-	   } else if ((s->type != at_output) && (s->type != at_temp)) {

-	      yyerror(& @1, state, "invalid operand variable");

-	      YYERROR;

-	   }

-

-	   switch (s->type) {

-	   case at_temp:

-	      set_dst_reg(& $$, PROGRAM_TEMPORARY, s->temp_binding);

-	      break;

-	   case at_output:

-	      set_dst_reg(& $$, PROGRAM_OUTPUT, s->output_binding);

-	      break;

-	   default:

-	      set_dst_reg(& $$, s->param_binding_type, s->param_binding_begin);

-	      break;

-	   }

-	}

-	;

-

-progParamArray: USED_IDENTIFIER

-	{

-	   struct asm_symbol *const s = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);

-

-	   free($1);

-

-	   if (s == NULL) {

-	      yyerror(& @1, state, "invalid operand variable");

-	      YYERROR;

-	   } else if ((s->type != at_param) || !s->param_is_array) {

-	      yyerror(& @1, state, "array access to non-PARAM variable");

-	      YYERROR;

-	   } else {

-	      $$ = s;

-	   }

-	}

-	;

-

-progParamArrayMem: progParamArrayAbs | progParamArrayRel;

-

-progParamArrayAbs: INTEGER

-	{

-	   init_src_reg(& $$);

-	   $$.Base.Index = $1;

-	}

-	;

-

-progParamArrayRel: addrReg addrComponent addrRegRelOffset

-	{

-	   /* FINISHME: Add support for multiple address registers.

-	    */

-	   /* FINISHME: Add support for 4-component address registers.

-	    */

-	   init_src_reg(& $$);

-	   $$.Base.RelAddr = 1;

-	   $$.Base.Index = $3;

-	}

-	;

-

-addrRegRelOffset:              { $$ = 0; }

-	| '+' addrRegPosOffset { $$ = $2; }

-	| '-' addrRegNegOffset { $$ = -$2; }

-	;

-

-addrRegPosOffset: INTEGER

-	{

-	   if (($1 < 0) || ($1 > 4095)) {

-              char s[100];

-              _mesa_snprintf(s, sizeof(s),

-                             "relative address offset too large (%d)", $1);

-	      yyerror(& @1, state, s);

-	      YYERROR;

-	   } else {

-	      $$ = $1;

-	   }

-	}

-	;

-

-addrRegNegOffset: INTEGER

-	{

-	   if (($1 < 0) || ($1 > 4096)) {

-              char s[100];

-              _mesa_snprintf(s, sizeof(s),

-                             "relative address offset too large (%d)", $1);

-	      yyerror(& @1, state, s);

-	      YYERROR;

-	   } else {

-	      $$ = $1;

-	   }

-	}

-	;

-

-addrReg: USED_IDENTIFIER

-	{

-	   struct asm_symbol *const s = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, $1);

-

-	   free($1);

-

-	   if (s == NULL) {

-	      yyerror(& @1, state, "invalid array member");

-	      YYERROR;

-	   } else if (s->type != at_address) {

-	      yyerror(& @1, state,

-		      "invalid variable for indexed array access");

-	      YYERROR;

-	   } else {

-	      $$ = s;

-	   }

-	}

-	;

-

-addrComponent: MASK1

-	{

-	   if ($1.mask != WRITEMASK_X) {

-	      yyerror(& @1, state, "invalid address component selector");

-	      YYERROR;

-	   } else {

-	      $$ = $1;

-	   }

-	}

-	;

-

-addrWriteMask: MASK1

-	{

-	   if ($1.mask != WRITEMASK_X) {

-	      yyerror(& @1, state,

-		      "address register write mask must be \".x\"");

-	      YYERROR;

-	   } else {

-	      $$ = $1;

-	   }

-	}

-	;

-

-scalarSuffix: MASK1;

-

-swizzleSuffix: MASK1

-	| MASK4

-	| SWIZZLE

-	|              { $$.swizzle = SWIZZLE_NOOP; $$.mask = WRITEMASK_XYZW; }

-	;

-

-optionalMask: MASK4 | MASK3 | MASK2 | MASK1 

-	|              { $$.swizzle = SWIZZLE_NOOP; $$.mask = WRITEMASK_XYZW; }

-	;

-

-optionalCcMask: '(' ccTest ')'

-	{

-	   $$ = $2;

-	}

-	| '(' ccTest2 ')'

-	{

-	   $$ = $2;

-	}

-	|

-	{

-	   $$.CondMask = COND_TR;

-	   $$.CondSwizzle = SWIZZLE_NOOP;

-	   $$.CondSrc = 0;

-	}

-	;

-

-ccTest: ccMaskRule swizzleSuffix

-	{

-	   $$ = $1;

-	   $$.CondSwizzle = $2.swizzle;

-	}

-	;

-

-ccTest2: ccMaskRule2 swizzleSuffix

-	{

-	   $$ = $1;

-	   $$.CondSwizzle = $2.swizzle;

-	}

-	;

-

-ccMaskRule: IDENTIFIER

-	{

-	   const int cond = _mesa_parse_cc($1);

-	   if ((cond == 0) || ($1[2] != '\0')) {

-	      char *const err_str =

-		 make_error_string("invalid condition code \"%s\"", $1);

-

-	      yyerror(& @1, state, (err_str != NULL)

-		      ? err_str : "invalid condition code");

-

-	      if (err_str != NULL) {

-		 free(err_str);

-	      }

-

-	      YYERROR;

-	   }

-

-	   $$.CondMask = cond;

-	   $$.CondSwizzle = SWIZZLE_NOOP;

-	   $$.CondSrc = 0;

-	}

-	;

-

-ccMaskRule2: USED_IDENTIFIER

-	{

-	   const int cond = _mesa_parse_cc($1);

-	   if ((cond == 0) || ($1[2] != '\0')) {

-	      char *const err_str =

-		 make_error_string("invalid condition code \"%s\"", $1);

-

-	      yyerror(& @1, state, (err_str != NULL)

-		      ? err_str : "invalid condition code");

-

-	      if (err_str != NULL) {

-		 free(err_str);

-	      }

-

-	      YYERROR;

-	   }

-

-	   $$.CondMask = cond;

-	   $$.CondSwizzle = SWIZZLE_NOOP;

-	   $$.CondSrc = 0;

-	}

-	;

-

-namingStatement: ATTRIB_statement

-	| PARAM_statement

-	| TEMP_statement

-	| ADDRESS_statement

-	| OUTPUT_statement

-	| ALIAS_statement

-	;

-

-ATTRIB_statement: ATTRIB IDENTIFIER '=' attribBinding

-	{

-	   struct asm_symbol *const s =

-	      declare_variable(state, $2, at_attrib, & @2);

-

-	   if (s == NULL) {

-	      free($2);

-	      YYERROR;

-	   } else {

-	      s->attrib_binding = $4;

-	      state->InputsBound |= (1U << s->attrib_binding);

-

-	      if (!validate_inputs(& @4, state)) {

-		 YYERROR;

-	      }

-	   }

-	}

-	;

-

-attribBinding: VERTEX vtxAttribItem

-	{

-	   $$ = $2;

-	}

-	| FRAGMENT fragAttribItem

-	{

-	   $$ = $2;

-	}

-	;

-

-vtxAttribItem: POSITION

-	{

-	   $$ = VERT_ATTRIB_POS;

-	}

-	| WEIGHT vtxOptWeightNum

-	{

-	   $$ = VERT_ATTRIB_WEIGHT;

-	}

-	| NORMAL

-	{

-	   $$ = VERT_ATTRIB_NORMAL;

-	}

-	| COLOR optColorType

-	{

-	   if (!state->ctx->Extensions.EXT_secondary_color) {

-	      yyerror(& @2, state, "GL_EXT_secondary_color not supported");

-	      YYERROR;

-	   }

-

-	   $$ = VERT_ATTRIB_COLOR0 + $2;

-	}

-	| FOGCOORD

-	{

-	   if (!state->ctx->Extensions.EXT_fog_coord) {

-	      yyerror(& @1, state, "GL_EXT_fog_coord not supported");

-	      YYERROR;

-	   }

-

-	   $$ = VERT_ATTRIB_FOG;

-	}

-	| TEXCOORD optTexCoordUnitNum

-	{

-	   $$ = VERT_ATTRIB_TEX0 + $2;

-	}

-	| MATRIXINDEX '[' vtxWeightNum ']'

-	{

-	   yyerror(& @1, state, "GL_ARB_matrix_palette not supported");

-	   YYERROR;

-	}

-	| VTXATTRIB '[' vtxAttribNum ']'

-	{

-	   $$ = VERT_ATTRIB_GENERIC0 + $3;

-	}

-	;

-

-vtxAttribNum: INTEGER

-	{

-	   if ((unsigned) $1 >= state->limits->MaxAttribs) {

-	      yyerror(& @1, state, "invalid vertex attribute reference");

-	      YYERROR;

-	   }

-

-	   $$ = $1;

-	}

-	;

-

-vtxOptWeightNum:  | '[' vtxWeightNum ']';

-vtxWeightNum: INTEGER;

-

-fragAttribItem: POSITION

-	{

-	   $$ = FRAG_ATTRIB_WPOS;

-	}

-	| COLOR optColorType

-	{

-	   $$ = FRAG_ATTRIB_COL0 + $2;

-	}

-	| FOGCOORD

-	{

-	   $$ = FRAG_ATTRIB_FOGC;

-	}

-	| TEXCOORD optTexCoordUnitNum

-	{

-	   $$ = FRAG_ATTRIB_TEX0 + $2;

-	}

-	;

-

-PARAM_statement: PARAM_singleStmt | PARAM_multipleStmt;

-

-PARAM_singleStmt: PARAM IDENTIFIER paramSingleInit

-	{

-	   struct asm_symbol *const s =

-	      declare_variable(state, $2, at_param, & @2);

-

-	   if (s == NULL) {

-	      free($2);

-	      YYERROR;

-	   } else {

-	      s->param_binding_type = $3.param_binding_type;

-	      s->param_binding_begin = $3.param_binding_begin;

-	      s->param_binding_length = $3.param_binding_length;

-              s->param_binding_swizzle = $3.param_binding_swizzle;

-	      s->param_is_array = 0;

-	   }

-	}

-	;

-

-PARAM_multipleStmt: PARAM IDENTIFIER '[' optArraySize ']' paramMultipleInit

-	{

-	   if (($4 != 0) && ((unsigned) $4 != $6.param_binding_length)) {

-	      free($2);

-	      yyerror(& @4, state, 

-		      "parameter array size and number of bindings must match");

-	      YYERROR;

-	   } else {

-	      struct asm_symbol *const s =

-		 declare_variable(state, $2, $6.type, & @2);

-

-	      if (s == NULL) {

-		 free($2);

-		 YYERROR;

-	      } else {

-		 s->param_binding_type = $6.param_binding_type;

-		 s->param_binding_begin = $6.param_binding_begin;

-		 s->param_binding_length = $6.param_binding_length;

-                 s->param_binding_swizzle = SWIZZLE_XYZW;

-		 s->param_is_array = 1;

-	      }

-	   }

-	}

-	;

-

-optArraySize:

-	{

-	   $$ = 0;

-	}

-	| INTEGER

-        {

-	   if (($1 < 1) || ((unsigned) $1 > state->limits->MaxParameters)) {

-	      yyerror(& @1, state, "invalid parameter array size");

-	      YYERROR;

-	   } else {

-	      $$ = $1;

-	   }

-	}

-	;

-

-paramSingleInit: '=' paramSingleItemDecl

-	{

-	   $$ = $2;

-	}

-	;

-

-paramMultipleInit: '=' '{' paramMultInitList '}'

-	{

-	   $$ = $3;

-	}

-	;

-

-paramMultInitList: paramMultipleItem

-	| paramMultInitList ',' paramMultipleItem

-	{

-	   $1.param_binding_length += $3.param_binding_length;

-	   $$ = $1;

-	}

-	;

-

-paramSingleItemDecl: stateSingleItem

-	{

-	   memset(& $$, 0, sizeof($$));

-	   $$.param_binding_begin = ~0;

-	   initialize_symbol_from_state(state->prog, & $$, $1);

-	}

-	| programSingleItem

-	{

-	   memset(& $$, 0, sizeof($$));

-	   $$.param_binding_begin = ~0;

-	   initialize_symbol_from_param(state->prog, & $$, $1);

-	}

-	| paramConstDecl

-	{

-	   memset(& $$, 0, sizeof($$));

-	   $$.param_binding_begin = ~0;

-	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_TRUE);

-	}

-	;

-

-paramSingleItemUse: stateSingleItem

-	{

-	   memset(& $$, 0, sizeof($$));

-	   $$.param_binding_begin = ~0;

-	   initialize_symbol_from_state(state->prog, & $$, $1);

-	}

-	| programSingleItem

-	{

-	   memset(& $$, 0, sizeof($$));

-	   $$.param_binding_begin = ~0;

-	   initialize_symbol_from_param(state->prog, & $$, $1);

-	}

-	| paramConstUse

-	{

-	   memset(& $$, 0, sizeof($$));

-	   $$.param_binding_begin = ~0;

-	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_TRUE);

-	}

-	;

-

-paramMultipleItem: stateMultipleItem

-	{

-	   memset(& $$, 0, sizeof($$));

-	   $$.param_binding_begin = ~0;

-	   initialize_symbol_from_state(state->prog, & $$, $1);

-	}

-	| programMultipleItem

-	{

-	   memset(& $$, 0, sizeof($$));

-	   $$.param_binding_begin = ~0;

-	   initialize_symbol_from_param(state->prog, & $$, $1);

-	}

-	| paramConstDecl

-	{

-	   memset(& $$, 0, sizeof($$));

-	   $$.param_binding_begin = ~0;

-	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_FALSE);

-	}

-	;

-

-stateMultipleItem: stateSingleItem        { memcpy($$, $1, sizeof($$)); }

-	| STATE stateMatrixRows           { memcpy($$, $2, sizeof($$)); }

-	;

-

-stateSingleItem: STATE stateMaterialItem  { memcpy($$, $2, sizeof($$)); }

-	| STATE stateLightItem            { memcpy($$, $2, sizeof($$)); }

-	| STATE stateLightModelItem       { memcpy($$, $2, sizeof($$)); }

-	| STATE stateLightProdItem        { memcpy($$, $2, sizeof($$)); }

-	| STATE stateTexGenItem           { memcpy($$, $2, sizeof($$)); }

-	| STATE stateTexEnvItem           { memcpy($$, $2, sizeof($$)); }

-	| STATE stateFogItem              { memcpy($$, $2, sizeof($$)); }

-	| STATE stateClipPlaneItem        { memcpy($$, $2, sizeof($$)); }

-	| STATE statePointItem            { memcpy($$, $2, sizeof($$)); }

-	| STATE stateMatrixRow            { memcpy($$, $2, sizeof($$)); }

-	| STATE stateDepthItem            { memcpy($$, $2, sizeof($$)); }

-	;

-

-stateMaterialItem: MATERIAL optFaceType stateMatProperty

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = STATE_MATERIAL;

-	   $$[1] = $2;

-	   $$[2] = $3;

-	}

-	;

-

-stateMatProperty: ambDiffSpecProperty

-	{

-	   $$ = $1;

-	}

-	| EMISSION

-	{

-	   $$ = STATE_EMISSION;

-	}

-	| SHININESS

-	{

-	   $$ = STATE_SHININESS;

-	}

-	;

-

-stateLightItem: LIGHT '[' stateLightNumber ']' stateLightProperty

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = STATE_LIGHT;

-	   $$[1] = $3;

-	   $$[2] = $5;

-	}

-	;

-

-stateLightProperty: ambDiffSpecProperty

-	{

-	   $$ = $1;

-	}

-	| POSITION

-	{

-	   $$ = STATE_POSITION;

-	}

-	| ATTENUATION

-	{

-	   if (!state->ctx->Extensions.EXT_point_parameters) {

-	      yyerror(& @1, state, "GL_ARB_point_parameters not supported");

-	      YYERROR;

-	   }

-

-	   $$ = STATE_ATTENUATION;

-	}

-	| SPOT stateSpotProperty

-	{

-	   $$ = $2;

-	}

-	| HALF

-	{

-	   $$ = STATE_HALF_VECTOR;

-	}

-	;

-

-stateSpotProperty: DIRECTION

-	{

-	   $$ = STATE_SPOT_DIRECTION;

-	}

-	;

-

-stateLightModelItem: LIGHTMODEL stateLModProperty

-	{

-	   $$[0] = $2[0];

-	   $$[1] = $2[1];

-	}

-	;

-

-stateLModProperty: AMBIENT

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = STATE_LIGHTMODEL_AMBIENT;

-	}

-	| optFaceType SCENECOLOR

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = STATE_LIGHTMODEL_SCENECOLOR;

-	   $$[1] = $1;

-	}

-	;

-

-stateLightProdItem: LIGHTPROD '[' stateLightNumber ']' optFaceType stateLProdProperty

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = STATE_LIGHTPROD;

-	   $$[1] = $3;

-	   $$[2] = $5;

-	   $$[3] = $6;

-	}

-	;

-

-stateLProdProperty: ambDiffSpecProperty;

-

-stateTexEnvItem: TEXENV optLegacyTexUnitNum stateTexEnvProperty

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = $3;

-	   $$[1] = $2;

-	}

-	;

-

-stateTexEnvProperty: COLOR

-	{

-	   $$ = STATE_TEXENV_COLOR;

-	}

-	;

-

-ambDiffSpecProperty: AMBIENT

-	{

-	   $$ = STATE_AMBIENT;

-	}

-	| DIFFUSE

-	{

-	   $$ = STATE_DIFFUSE;

-	}

-	| SPECULAR

-	{

-	   $$ = STATE_SPECULAR;

-	}

-	;

-

-stateLightNumber: INTEGER

-	{

-	   if ((unsigned) $1 >= state->MaxLights) {

-	      yyerror(& @1, state, "invalid light selector");

-	      YYERROR;

-	   }

-

-	   $$ = $1;

-	}

-	;

-

-stateTexGenItem: TEXGEN optTexCoordUnitNum stateTexGenType stateTexGenCoord

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = STATE_TEXGEN;

-	   $$[1] = $2;

-	   $$[2] = $3 + $4;

-	}

-	;

-

-stateTexGenType: EYE

-	{

-	   $$ = STATE_TEXGEN_EYE_S;

-	}

-	| OBJECT

-	{

-	   $$ = STATE_TEXGEN_OBJECT_S;

-	}

-	;

-stateTexGenCoord: TEXGEN_S

-	{

-	   $$ = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;

-	}

-	| TEXGEN_T

-	{

-	   $$ = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;

-	}

-	| TEXGEN_R

-	{

-	   $$ = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;

-	}

-	| TEXGEN_Q

-	{

-	   $$ = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;

-	}

-	;

-

-stateFogItem: FOG stateFogProperty

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = $2;

-	}

-	;

-

-stateFogProperty: COLOR

-	{

-	   $$ = STATE_FOG_COLOR;

-	}

-	| PARAMS

-	{

-	   $$ = STATE_FOG_PARAMS;

-	}

-	;

-

-stateClipPlaneItem: CLIP '[' stateClipPlaneNum ']' PLANE

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = STATE_CLIPPLANE;

-	   $$[1] = $3;

-	}

-	;

-

-stateClipPlaneNum: INTEGER

-	{

-	   if ((unsigned) $1 >= state->MaxClipPlanes) {

-	      yyerror(& @1, state, "invalid clip plane selector");

-	      YYERROR;

-	   }

-

-	   $$ = $1;

-	}

-	;

-

-statePointItem: POINT_TOK statePointProperty

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = $2;

-	}

-	;

-

-statePointProperty: SIZE_TOK

-	{

-	   $$ = STATE_POINT_SIZE;

-	}

-	| ATTENUATION

-	{

-	   $$ = STATE_POINT_ATTENUATION;

-	}

-	;

-

-stateMatrixRow: stateMatrixItem ROW '[' stateMatrixRowNum ']'

-	{

-	   $$[0] = $1[0];

-	   $$[1] = $1[1];

-	   $$[2] = $4;

-	   $$[3] = $4;

-	   $$[4] = $1[2];

-	}

-	;

-

-stateMatrixRows: stateMatrixItem optMatrixRows

-	{

-	   $$[0] = $1[0];

-	   $$[1] = $1[1];

-	   $$[2] = $2[2];

-	   $$[3] = $2[3];

-	   $$[4] = $1[2];

-	}

-	;

-

-optMatrixRows:

-	{

-	   $$[2] = 0;

-	   $$[3] = 3;

-	}

-	| ROW '[' stateMatrixRowNum DOT_DOT stateMatrixRowNum ']'

-	{

-	   /* It seems logical that the matrix row range specifier would have

-	    * to specify a range or more than one row (i.e., $5 > $3).

-	    * However, the ARB_vertex_program spec says "a program will fail

-	    * to load if <a> is greater than <b>."  This means that $3 == $5

-	    * is valid.

-	    */

-	   if ($3 > $5) {

-	      yyerror(& @3, state, "invalid matrix row range");

-	      YYERROR;

-	   }

-

-	   $$[2] = $3;

-	   $$[3] = $5;

-	}

-	;

-

-stateMatrixItem: MATRIX stateMatrixName stateOptMatModifier

-	{

-	   $$[0] = $2[0];

-	   $$[1] = $2[1];

-	   $$[2] = $3;

-	}

-	;

-

-stateOptMatModifier: 

-	{

-	   $$ = 0;

-	}

-	| stateMatModifier

-	{

-	   $$ = $1;

-	}

-	;

-

-stateMatModifier: INVERSE 

-	{

-	   $$ = STATE_MATRIX_INVERSE;

-	}

-	| TRANSPOSE 

-	{

-	   $$ = STATE_MATRIX_TRANSPOSE;

-	}

-	| INVTRANS

-	{

-	   $$ = STATE_MATRIX_INVTRANS;

-	}

-	;

-

-stateMatrixRowNum: INTEGER

-	{

-	   if ($1 > 3) {

-	      yyerror(& @1, state, "invalid matrix row reference");

-	      YYERROR;

-	   }

-

-	   $$ = $1;

-	}

-	;

-

-stateMatrixName: MODELVIEW stateOptModMatNum

-	{

-	   $$[0] = STATE_MODELVIEW_MATRIX;

-	   $$[1] = $2;

-	}

-	| PROJECTION

-	{

-	   $$[0] = STATE_PROJECTION_MATRIX;

-	   $$[1] = 0;

-	}

-	| MVP

-	{

-	   $$[0] = STATE_MVP_MATRIX;

-	   $$[1] = 0;

-	}

-	| TEXTURE optTexCoordUnitNum

-	{

-	   $$[0] = STATE_TEXTURE_MATRIX;

-	   $$[1] = $2;

-	}

-	| PALETTE '[' statePaletteMatNum ']'

-	{

-	   yyerror(& @1, state, "GL_ARB_matrix_palette not supported");

-	   YYERROR;

-	}

-	| MAT_PROGRAM '[' stateProgramMatNum ']'

-	{

-	   $$[0] = STATE_PROGRAM_MATRIX;

-	   $$[1] = $3;

-	}

-	;

-

-stateOptModMatNum:

-	{

-	   $$ = 0;

-	}

-	| '[' stateModMatNum ']'

-	{

-	   $$ = $2;

-	}

-	;

-stateModMatNum: INTEGER

-	{

-	   /* Since GL_ARB_vertex_blend isn't supported, only modelview matrix

-	    * zero is valid.

-	    */

-	   if ($1 != 0) {

-	      yyerror(& @1, state, "invalid modelview matrix index");

-	      YYERROR;

-	   }

-

-	   $$ = $1;

-	}

-	;

-statePaletteMatNum: INTEGER

-	{

-	   /* Since GL_ARB_matrix_palette isn't supported, just let any value

-	    * through here.  The error will be generated later.

-	    */

-	   $$ = $1;

-	}

-	;

-stateProgramMatNum: INTEGER

-	{

-	   if ((unsigned) $1 >= state->MaxProgramMatrices) {

-	      yyerror(& @1, state, "invalid program matrix selector");

-	      YYERROR;

-	   }

-

-	   $$ = $1;

-	}

-	;

-

-stateDepthItem: DEPTH RANGE

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = STATE_DEPTH_RANGE;

-	}

-	;

-

-

-programSingleItem: progEnvParam | progLocalParam;

-

-programMultipleItem: progEnvParams | progLocalParams;

-

-progEnvParams: PROGRAM ENV '[' progEnvParamNums ']'

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = state->state_param_enum;

-	   $$[1] = STATE_ENV;

-	   $$[2] = $4[0];

-	   $$[3] = $4[1];

-	}

-	;

-

-progEnvParamNums: progEnvParamNum

-	{

-	   $$[0] = $1;

-	   $$[1] = $1;

-	}

-	| progEnvParamNum DOT_DOT progEnvParamNum

-	{

-	   $$[0] = $1;

-	   $$[1] = $3;

-	}

-	;

-

-progEnvParam: PROGRAM ENV '[' progEnvParamNum ']'

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = state->state_param_enum;

-	   $$[1] = STATE_ENV;

-	   $$[2] = $4;

-	   $$[3] = $4;

-	}

-	;

-

-progLocalParams: PROGRAM LOCAL '[' progLocalParamNums ']'

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = state->state_param_enum;

-	   $$[1] = STATE_LOCAL;

-	   $$[2] = $4[0];

-	   $$[3] = $4[1];

-	}

-

-progLocalParamNums: progLocalParamNum

-	{

-	   $$[0] = $1;

-	   $$[1] = $1;

-	}

-	| progLocalParamNum DOT_DOT progLocalParamNum

-	{

-	   $$[0] = $1;

-	   $$[1] = $3;

-	}

-	;

-

-progLocalParam: PROGRAM LOCAL '[' progLocalParamNum ']'

-	{

-	   memset($$, 0, sizeof($$));

-	   $$[0] = state->state_param_enum;

-	   $$[1] = STATE_LOCAL;

-	   $$[2] = $4;

-	   $$[3] = $4;

-	}

-	;

-

-progEnvParamNum: INTEGER

-	{

-	   if ((unsigned) $1 >= state->limits->MaxEnvParams) {

-	      yyerror(& @1, state, "invalid environment parameter reference");

-	      YYERROR;

-	   }

-	   $$ = $1;

-	}

-	;

-

-progLocalParamNum: INTEGER

-	{

-	   if ((unsigned) $1 >= state->limits->MaxLocalParams) {

-	      yyerror(& @1, state, "invalid local parameter reference");

-	      YYERROR;

-	   }

-	   $$ = $1;

-	}

-	;

-

-

-

-paramConstDecl: paramConstScalarDecl | paramConstVector;

-paramConstUse: paramConstScalarUse | paramConstVector;

-

-paramConstScalarDecl: signedFloatConstant

-	{

-	   $$.count = 4;

-	   $$.data[0] = $1;

-	   $$.data[1] = $1;

-	   $$.data[2] = $1;

-	   $$.data[3] = $1;

-	}

-	;

-

-paramConstScalarUse: REAL

-	{

-	   $$.count = 1;

-	   $$.data[0] = $1;

-	   $$.data[1] = $1;

-	   $$.data[2] = $1;

-	   $$.data[3] = $1;

-	}

-	| INTEGER

-	{

-	   $$.count = 1;

-	   $$.data[0] = (float) $1;

-	   $$.data[1] = (float) $1;

-	   $$.data[2] = (float) $1;

-	   $$.data[3] = (float) $1;

-	}

-	;

-

-paramConstVector: '{' signedFloatConstant '}'

-	{

-	   $$.count = 4;

-	   $$.data[0] = $2;

-	   $$.data[1] = 0.0f;

-	   $$.data[2] = 0.0f;

-	   $$.data[3] = 1.0f;

-	}

-	| '{' signedFloatConstant ',' signedFloatConstant '}'

-	{

-	   $$.count = 4;

-	   $$.data[0] = $2;

-	   $$.data[1] = $4;

-	   $$.data[2] = 0.0f;

-	   $$.data[3] = 1.0f;

-	}

-	| '{' signedFloatConstant ',' signedFloatConstant ','

-              signedFloatConstant '}'

-	{

-	   $$.count = 4;

-	   $$.data[0] = $2;

-	   $$.data[1] = $4;

-	   $$.data[2] = $6;

-	   $$.data[3] = 1.0f;

-	}

-	| '{' signedFloatConstant ',' signedFloatConstant ','

-              signedFloatConstant ',' signedFloatConstant '}'

-	{

-	   $$.count = 4;

-	   $$.data[0] = $2;

-	   $$.data[1] = $4;

-	   $$.data[2] = $6;

-	   $$.data[3] = $8;

-	}

-	;

-

-signedFloatConstant: optionalSign REAL

-	{

-	   $$ = ($1) ? -$2 : $2;

-	}

-	| optionalSign INTEGER

-	{

-	   $$ = (float)(($1) ? -$2 : $2);

-	}

-	;

-

-optionalSign: '+'        { $$ = FALSE; }

-	| '-'            { $$ = TRUE;  }

-	|                { $$ = FALSE; }

-	;

-

-TEMP_statement: optVarSize TEMP { $<integer>$ = $2; } varNameList

-	;

-

-optVarSize: string

-	{

-	   /* NV_fragment_program_option defines the size qualifiers in a

-	    * fairly broken way.  "SHORT" or "LONG" can optionally be used

-	    * before TEMP or OUTPUT.  However, neither is a reserved word!

-	    * This means that we have to parse it as an identifier, then check

-	    * to make sure it's one of the valid values.  *sigh*

-	    *

-	    * In addition, the grammar in the extension spec does *not* allow

-	    * the size specifier to be optional, but all known implementations

-	    * do.

-	    */

-	   if (!state->option.NV_fragment) {

-	      yyerror(& @1, state, "unexpected IDENTIFIER");

-	      YYERROR;

-	   }

-

-	   if (strcmp("SHORT", $1) == 0) {

-	   } else if (strcmp("LONG", $1) == 0) {

-	   } else {

-	      char *const err_str =

-		 make_error_string("invalid storage size specifier \"%s\"",

-				   $1);

-

-	      yyerror(& @1, state, (err_str != NULL)

-		      ? err_str : "invalid storage size specifier");

-

-	      if (err_str != NULL) {

-		 free(err_str);

-	      }

-

-	      YYERROR;

-	   }

-	}

-	|

-	{

-	}

-	;

-

-ADDRESS_statement: ADDRESS { $<integer>$ = $1; } varNameList

-	;

-

-varNameList: varNameList ',' IDENTIFIER

-	{

-	   if (!declare_variable(state, $3, $<integer>0, & @3)) {

-	      free($3);

-	      YYERROR;

-	   }

-	}

-	| IDENTIFIER

-	{

-	   if (!declare_variable(state, $1, $<integer>0, & @1)) {

-	      free($1);

-	      YYERROR;

-	   }

-	}

-	;

-

-OUTPUT_statement: optVarSize OUTPUT IDENTIFIER '=' resultBinding

-	{

-	   struct asm_symbol *const s =

-	      declare_variable(state, $3, at_output, & @3);

-

-	   if (s == NULL) {

-	      free($3);

-	      YYERROR;

-	   } else {

-	      s->output_binding = $5;

-	   }

-	}

-	;

-

-resultBinding: RESULT POSITION

-	{

-	   if (state->mode == ARB_vertex) {

-	      $$ = VERT_RESULT_HPOS;

-	   } else {

-	      yyerror(& @2, state, "invalid program result name");

-	      YYERROR;

-	   }

-	}

-	| RESULT FOGCOORD

-	{

-	   if (state->mode == ARB_vertex) {

-	      $$ = VERT_RESULT_FOGC;

-	   } else {

-	      yyerror(& @2, state, "invalid program result name");

-	      YYERROR;

-	   }

-	}

-	| RESULT resultColBinding

-	{

-	   $$ = $2;

-	}

-	| RESULT POINTSIZE

-	{

-	   if (state->mode == ARB_vertex) {

-	      $$ = VERT_RESULT_PSIZ;

-	   } else {

-	      yyerror(& @2, state, "invalid program result name");

-	      YYERROR;

-	   }

-	}

-	| RESULT TEXCOORD optTexCoordUnitNum

-	{

-	   if (state->mode == ARB_vertex) {

-	      $$ = VERT_RESULT_TEX0 + $3;

-	   } else {

-	      yyerror(& @2, state, "invalid program result name");

-	      YYERROR;

-	   }

-	}

-	| RESULT DEPTH

-	{

-	   if (state->mode == ARB_fragment) {

-	      $$ = FRAG_RESULT_DEPTH;

-	   } else {

-	      yyerror(& @2, state, "invalid program result name");

-	      YYERROR;

-	   }

-	}

-	;

-

-resultColBinding: COLOR optResultFaceType optResultColorType

-	{

-	   $$ = $2 + $3;

-	}

-	;

-

-optResultFaceType:

-	{

-	   $$ = (state->mode == ARB_vertex)

-	      ? VERT_RESULT_COL0

-	      : FRAG_RESULT_COLOR;

-	}

-	| FRONT

-	{

-	   if (state->mode == ARB_vertex) {

-	      $$ = VERT_RESULT_COL0;

-	   } else {

-	      yyerror(& @1, state, "invalid program result name");

-	      YYERROR;

-	   }

-	}

-	| BACK

-	{

-	   if (state->mode == ARB_vertex) {

-	      $$ = VERT_RESULT_BFC0;

-	   } else {

-	      yyerror(& @1, state, "invalid program result name");

-	      YYERROR;

-	   }

-	}

-	;

-

-optResultColorType:

-	{

-	   $$ = 0; 

-	}

-	| PRIMARY

-	{

-	   if (state->mode == ARB_vertex) {

-	      $$ = 0;

-	   } else {

-	      yyerror(& @1, state, "invalid program result name");

-	      YYERROR;

-	   }

-	}

-	| SECONDARY

-	{

-	   if (state->mode == ARB_vertex) {

-	      $$ = 1;

-	   } else {

-	      yyerror(& @1, state, "invalid program result name");

-	      YYERROR;

-	   }

-	}

-	;

-

-optFaceType:    { $$ = 0; }

-	| FRONT	{ $$ = 0; }

-	| BACK  { $$ = 1; }

-	;

-

-optColorType:       { $$ = 0; }

-	| PRIMARY   { $$ = 0; }

-	| SECONDARY { $$ = 1; }

-	;

-

-optTexCoordUnitNum:                { $$ = 0; }

-	| '[' texCoordUnitNum ']'  { $$ = $2; }

-	;

-

-optTexImageUnitNum:                { $$ = 0; }

-	| '[' texImageUnitNum ']'  { $$ = $2; }

-	;

-

-optLegacyTexUnitNum:               { $$ = 0; }

-	| '[' legacyTexUnitNum ']' { $$ = $2; }

-	;

-

-texCoordUnitNum: INTEGER

-	{

-	   if ((unsigned) $1 >= state->MaxTextureCoordUnits) {

-	      yyerror(& @1, state, "invalid texture coordinate unit selector");

-	      YYERROR;

-	   }

-

-	   $$ = $1;

-	}

-	;

-

-texImageUnitNum: INTEGER

-	{

-	   if ((unsigned) $1 >= state->MaxTextureImageUnits) {

-	      yyerror(& @1, state, "invalid texture image unit selector");

-	      YYERROR;

-	   }

-

-	   $$ = $1;

-	}

-	;

-

-legacyTexUnitNum: INTEGER

-	{

-	   if ((unsigned) $1 >= state->MaxTextureUnits) {

-	      yyerror(& @1, state, "invalid texture unit selector");

-	      YYERROR;

-	   }

-

-	   $$ = $1;

-	}

-	;

-

-ALIAS_statement: ALIAS IDENTIFIER '=' USED_IDENTIFIER

-	{

-	   struct asm_symbol *exist = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, $2);

-	   struct asm_symbol *target = (struct asm_symbol *)

-	      _mesa_symbol_table_find_symbol(state->st, 0, $4);

-

-	   free($4);

-

-	   if (exist != NULL) {

-	      char m[1000];

-	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", $2);

-	      free($2);

-	      yyerror(& @2, state, m);

-	      YYERROR;

-	   } else if (target == NULL) {

-	      free($2);

-	      yyerror(& @4, state,

-		      "undefined variable binding in ALIAS statement");

-	      YYERROR;

-	   } else {

-	      _mesa_symbol_table_add_symbol(state->st, 0, $2, target);

-	   }

-	}

-	;

-

-string: IDENTIFIER

-	| USED_IDENTIFIER

-	;

-

-%%

-

-void

-asm_instruction_set_operands(struct asm_instruction *inst,

-			     const struct prog_dst_register *dst,

-			     const struct asm_src_register *src0,

-			     const struct asm_src_register *src1,

-			     const struct asm_src_register *src2)

-{

-   /* In the core ARB extensions only the KIL instruction doesn't have a

-    * destination register.

-    */

-   if (dst == NULL) {

-      init_dst_reg(& inst->Base.DstReg);

-   } else {

-      inst->Base.DstReg = *dst;

-   }

-

-   /* The only instruction that doesn't have any source registers is the

-    * condition-code based KIL instruction added by NV_fragment_program_option.

-    */

-   if (src0 != NULL) {

-      inst->Base.SrcReg[0] = src0->Base;

-      inst->SrcReg[0] = *src0;

-   } else {

-      init_src_reg(& inst->SrcReg[0]);

-   }

-

-   if (src1 != NULL) {

-      inst->Base.SrcReg[1] = src1->Base;

-      inst->SrcReg[1] = *src1;

-   } else {

-      init_src_reg(& inst->SrcReg[1]);

-   }

-

-   if (src2 != NULL) {

-      inst->Base.SrcReg[2] = src2->Base;

-      inst->SrcReg[2] = *src2;

-   } else {

-      init_src_reg(& inst->SrcReg[2]);

-   }

-}

-

-

-struct asm_instruction *

-asm_instruction_ctor(gl_inst_opcode op,

-		     const struct prog_dst_register *dst,

-		     const struct asm_src_register *src0,

-		     const struct asm_src_register *src1,

-		     const struct asm_src_register *src2)

-{

-   struct asm_instruction *inst = CALLOC_STRUCT(asm_instruction);

-

-   if (inst) {

-      _mesa_init_instructions(& inst->Base, 1);

-      inst->Base.Opcode = op;

-

-      asm_instruction_set_operands(inst, dst, src0, src1, src2);

-   }

-

-   return inst;

-}

-

-

-struct asm_instruction *

-asm_instruction_copy_ctor(const struct prog_instruction *base,

-			  const struct prog_dst_register *dst,

-			  const struct asm_src_register *src0,

-			  const struct asm_src_register *src1,

-			  const struct asm_src_register *src2)

-{

-   struct asm_instruction *inst = CALLOC_STRUCT(asm_instruction);

-

-   if (inst) {

-      _mesa_init_instructions(& inst->Base, 1);

-      inst->Base.Opcode = base->Opcode;

-      inst->Base.CondUpdate = base->CondUpdate;

-      inst->Base.CondDst = base->CondDst;

-      inst->Base.SaturateMode = base->SaturateMode;

-      inst->Base.Precision = base->Precision;

-

-      asm_instruction_set_operands(inst, dst, src0, src1, src2);

-   }

-

-   return inst;

-}

-

-

-void

-init_dst_reg(struct prog_dst_register *r)

-{

-   memset(r, 0, sizeof(*r));

-   r->File = PROGRAM_UNDEFINED;

-   r->WriteMask = WRITEMASK_XYZW;

-   r->CondMask = COND_TR;

-   r->CondSwizzle = SWIZZLE_NOOP;

-}

-

-

-/** Like init_dst_reg() but set the File and Index fields. */

-void

-set_dst_reg(struct prog_dst_register *r, gl_register_file file, GLint index)

-{

-   const GLint maxIndex = 1 << INST_INDEX_BITS;

-   const GLint minIndex = 0;

-   ASSERT(index >= minIndex);

-   (void) minIndex;

-   ASSERT(index <= maxIndex);

-   (void) maxIndex;

-   ASSERT(file == PROGRAM_TEMPORARY ||

-	  file == PROGRAM_ADDRESS ||

-	  file == PROGRAM_OUTPUT);

-   memset(r, 0, sizeof(*r));

-   r->File = file;

-   r->Index = index;

-   r->WriteMask = WRITEMASK_XYZW;

-   r->CondMask = COND_TR;

-   r->CondSwizzle = SWIZZLE_NOOP;

-}

-

-

-void

-init_src_reg(struct asm_src_register *r)

-{

-   memset(r, 0, sizeof(*r));

-   r->Base.File = PROGRAM_UNDEFINED;

-   r->Base.Swizzle = SWIZZLE_NOOP;

-   r->Symbol = NULL;

-}

-

-

-/** Like init_src_reg() but set the File and Index fields.

- * \return GL_TRUE if a valid src register, GL_FALSE otherwise

- */

-void

-set_src_reg(struct asm_src_register *r, gl_register_file file, GLint index)

-{

-   set_src_reg_swz(r, file, index, SWIZZLE_XYZW);

-}

-

-

-void

-set_src_reg_swz(struct asm_src_register *r, gl_register_file file, GLint index,

-                GLuint swizzle)

-{

-   const GLint maxIndex = (1 << INST_INDEX_BITS) - 1;

-   const GLint minIndex = -(1 << INST_INDEX_BITS);

-   ASSERT(file < PROGRAM_FILE_MAX);

-   ASSERT(index >= minIndex);

-   (void) minIndex;

-   ASSERT(index <= maxIndex);

-   (void) maxIndex;

-   memset(r, 0, sizeof(*r));

-   r->Base.File = file;

-   r->Base.Index = index;

-   r->Base.Swizzle = swizzle;

-   r->Symbol = NULL;

-}

-

-

-/**

- * Validate the set of inputs used by a program

- *

- * Validates that legal sets of inputs are used by the program.  In this case

- * "used" included both reading the input or binding the input to a name using

- * the \c ATTRIB command.

- *

- * \return

- * \c TRUE if the combination of inputs used is valid, \c FALSE otherwise.

- */

-int

-validate_inputs(struct YYLTYPE *locp, struct asm_parser_state *state)

-{

-   const int inputs = state->prog->InputsRead | state->InputsBound;

-

-   if (((inputs & 0x0ffff) & (inputs >> 16)) != 0) {

-      yyerror(locp, state, "illegal use of generic attribute and name attribute");

-      return 0;

-   }

-

-   return 1;

-}

-

-

-struct asm_symbol *

-declare_variable(struct asm_parser_state *state, char *name, enum asm_type t,

-		 struct YYLTYPE *locp)

-{

-   struct asm_symbol *s = NULL;

-   struct asm_symbol *exist = (struct asm_symbol *)

-      _mesa_symbol_table_find_symbol(state->st, 0, name);

-

-

-   if (exist != NULL) {

-      yyerror(locp, state, "redeclared identifier");

-   } else {

-      s = calloc(1, sizeof(struct asm_symbol));

-      s->name = name;

-      s->type = t;

-

-      switch (t) {

-      case at_temp:

-	 if (state->prog->NumTemporaries >= state->limits->MaxTemps) {

-	    yyerror(locp, state, "too many temporaries declared");

-	    free(s);

-	    return NULL;

-	 }

-

-	 s->temp_binding = state->prog->NumTemporaries;

-	 state->prog->NumTemporaries++;

-	 break;

-

-      case at_address:

-	 if (state->prog->NumAddressRegs >= state->limits->MaxAddressRegs) {

-	    yyerror(locp, state, "too many address registers declared");

-	    free(s);

-	    return NULL;

-	 }

-

-	 /* FINISHME: Add support for multiple address registers.

-	  */

-	 state->prog->NumAddressRegs++;

-	 break;

-

-      default:

-	 break;

-      }

-

-      _mesa_symbol_table_add_symbol(state->st, 0, s->name, s);

-      s->next = state->sym;

-      state->sym = s;

-   }

-

-   return s;

-}

-

-

-int add_state_reference(struct gl_program_parameter_list *param_list,

-			const gl_state_index tokens[STATE_LENGTH])

-{

-   const GLuint size = 4; /* XXX fix */

-   char *name;

-   GLint index;

-

-   name = _mesa_program_state_string(tokens);

-   index = _mesa_add_parameter(param_list, PROGRAM_STATE_VAR, name,

-                               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() */

-   free(name);

-

-   return index;

-}

-

-

-int

-initialize_symbol_from_state(struct gl_program *prog,

-			     struct asm_symbol *param_var, 

-			     const gl_state_index tokens[STATE_LENGTH])

-{

-   int idx = -1;

-   gl_state_index state_tokens[STATE_LENGTH];

-

-

-   memcpy(state_tokens, tokens, sizeof(state_tokens));

-

-   param_var->type = at_param;

-   param_var->param_binding_type = PROGRAM_STATE_VAR;

-

-   /* If we are adding a STATE_MATRIX that has multiple rows, we need to

-    * unroll it and call add_state_reference() for each row

-    */

-   if ((state_tokens[0] == STATE_MODELVIEW_MATRIX ||

-	state_tokens[0] == STATE_PROJECTION_MATRIX ||

-	state_tokens[0] == STATE_MVP_MATRIX ||

-	state_tokens[0] == STATE_TEXTURE_MATRIX ||

-	state_tokens[0] == STATE_PROGRAM_MATRIX)

-       && (state_tokens[2] != state_tokens[3])) {

-      int row;

-      const int first_row = state_tokens[2];

-      const int last_row = state_tokens[3];

-

-      for (row = first_row; row <= last_row; row++) {

-	 state_tokens[2] = state_tokens[3] = row;

-

-	 idx = add_state_reference(prog->Parameters, state_tokens);

-	 if (param_var->param_binding_begin == ~0U) {

-	    param_var->param_binding_begin = idx;

-            param_var->param_binding_swizzle = SWIZZLE_XYZW;

-         }

-

-	 param_var->param_binding_length++;

-      }

-   }

-   else {

-      idx = add_state_reference(prog->Parameters, state_tokens);

-      if (param_var->param_binding_begin == ~0U) {

-	 param_var->param_binding_begin = idx;

-         param_var->param_binding_swizzle = SWIZZLE_XYZW;

-      }

-      param_var->param_binding_length++;

-   }

-

-   return idx;

-}

-

-

-int

-initialize_symbol_from_param(struct gl_program *prog,

-			     struct asm_symbol *param_var, 

-			     const gl_state_index tokens[STATE_LENGTH])

-{

-   int idx = -1;

-   gl_state_index state_tokens[STATE_LENGTH];

-

-

-   memcpy(state_tokens, tokens, sizeof(state_tokens));

-

-   assert((state_tokens[0] == STATE_VERTEX_PROGRAM)

-	  || (state_tokens[0] == STATE_FRAGMENT_PROGRAM));

-   assert((state_tokens[1] == STATE_ENV)

-	  || (state_tokens[1] == STATE_LOCAL));

-

-   /*

-    * The param type is STATE_VAR.  The program parameter entry will

-    * effectively be a pointer into the LOCAL or ENV parameter array.

-    */

-   param_var->type = at_param;

-   param_var->param_binding_type = PROGRAM_STATE_VAR;

-

-   /* If we are adding a STATE_ENV or STATE_LOCAL that has multiple elements,

-    * we need to unroll it and call add_state_reference() for each row

-    */

-   if (state_tokens[2] != state_tokens[3]) {

-      int row;

-      const int first_row = state_tokens[2];

-      const int last_row = state_tokens[3];

-

-      for (row = first_row; row <= last_row; row++) {

-	 state_tokens[2] = state_tokens[3] = row;

-

-	 idx = add_state_reference(prog->Parameters, state_tokens);

-	 if (param_var->param_binding_begin == ~0U) {

-	    param_var->param_binding_begin = idx;

-            param_var->param_binding_swizzle = SWIZZLE_XYZW;

-         }

-	 param_var->param_binding_length++;

-      }

-   }

-   else {

-      idx = add_state_reference(prog->Parameters, state_tokens);

-      if (param_var->param_binding_begin == ~0U) {

-	 param_var->param_binding_begin = idx;

-         param_var->param_binding_swizzle = SWIZZLE_XYZW;

-      }

-      param_var->param_binding_length++;

-   }

-

-   return idx;

-}

-

-

-/**

- * Put a float/vector constant/literal into the parameter list.

- * \param param_var  returns info about the parameter/constant's location,

- *                   binding, type, etc.

- * \param vec  the vector/constant to add

- * \param allowSwizzle  if true, try to consolidate constants which only differ

- *                      by a swizzle.  We don't want to do this when building

- *                      arrays of constants that may be indexed indirectly.

- * \return index of the constant in the parameter list.

- */

-int

-initialize_symbol_from_const(struct gl_program *prog,

-			     struct asm_symbol *param_var, 

-			     const struct asm_vector *vec,

-                             GLboolean allowSwizzle)

-{

-   unsigned swizzle;

-   const int idx = _mesa_add_unnamed_constant(prog->Parameters,

-                                              vec->data, vec->count,

-                                              allowSwizzle ? &swizzle : NULL);

-

-   param_var->type = at_param;

-   param_var->param_binding_type = PROGRAM_CONSTANT;

-

-   if (param_var->param_binding_begin == ~0U) {

-      param_var->param_binding_begin = idx;

-      param_var->param_binding_swizzle = allowSwizzle ? swizzle : SWIZZLE_XYZW;

-   }

-   param_var->param_binding_length++;

-

-   return idx;

-}

-

-

-char *

-make_error_string(const char *fmt, ...)

-{

-   int length;

-   char *str;

-   va_list args;

-

-

-   /* Call vsnprintf once to determine how large the final string is.  Call it

-    * again to do the actual formatting.  from the vsnprintf manual page:

-    *

-    *    Upon successful return, these functions return the number of

-    *    characters printed  (not including the trailing '\0' used to end

-    *    output to strings).

-    */

-   va_start(args, fmt);

-   length = 1 + vsnprintf(NULL, 0, fmt, args);

-   va_end(args);

-

-   str = malloc(length);

-   if (str) {

-      va_start(args, fmt);

-      vsnprintf(str, length, fmt, args);

-      va_end(args);

-   }

-

-   return str;

-}

-

-

-void

-yyerror(YYLTYPE *locp, struct asm_parser_state *state, const char *s)

-{

-   char *err_str;

-

-

-   err_str = make_error_string("glProgramStringARB(%s)\n", s);

-   if (err_str) {

-      _mesa_error(state->ctx, GL_INVALID_OPERATION, "%s", err_str);

-      free(err_str);

-   }

-

-   err_str = make_error_string("line %u, char %u: error: %s\n",

-			       locp->first_line, locp->first_column, s);

-   _mesa_set_program_error(state->ctx, locp->position, err_str);

-

-   if (err_str) {

-      free(err_str);

-   }

-}

-

-

-GLboolean

-_mesa_parse_arb_program(struct gl_context *ctx, GLenum target, const GLubyte *str,

-			GLsizei len, struct asm_parser_state *state)

-{

-   struct asm_instruction *inst;

-   unsigned i;

-   GLubyte *strz;

-   GLboolean result = GL_FALSE;

-   void *temp;

-   struct asm_symbol *sym;

-

-   state->ctx = ctx;

-   state->prog->Target = target;

-   state->prog->Parameters = _mesa_new_parameter_list();

-

-   /* Make a copy of the program string and force it to be NUL-terminated.

-    */

-   strz = (GLubyte *) malloc(len + 1);

-   if (strz == NULL) {

-      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");

-      return GL_FALSE;

-   }

-   memcpy (strz, str, len);

-   strz[len] = '\0';

-

-   state->prog->String = strz;

-

-   state->st = _mesa_symbol_table_ctor();

-

-   state->limits = (target == GL_VERTEX_PROGRAM_ARB)

-      ? & ctx->Const.VertexProgram

-      : & ctx->Const.FragmentProgram;

-

-   state->MaxTextureImageUnits = ctx->Const.MaxTextureImageUnits;

-   state->MaxTextureCoordUnits = ctx->Const.MaxTextureCoordUnits;

-   state->MaxTextureUnits = ctx->Const.MaxTextureUnits;

-   state->MaxClipPlanes = ctx->Const.MaxClipPlanes;

-   state->MaxLights = ctx->Const.MaxLights;

-   state->MaxProgramMatrices = ctx->Const.MaxProgramMatrices;

-

-   state->state_param_enum = (target == GL_VERTEX_PROGRAM_ARB)

-      ? STATE_VERTEX_PROGRAM : STATE_FRAGMENT_PROGRAM;

-

-   _mesa_set_program_error(ctx, -1, NULL);

-

-   _mesa_program_lexer_ctor(& state->scanner, state, (const char *) str, len);

-   yyparse(state);

-   _mesa_program_lexer_dtor(state->scanner);

-

-

-   if (ctx->Program.ErrorPos != -1) {

-      goto error;

-   }

-

-   if (! _mesa_layout_parameters(state)) {

-      struct YYLTYPE loc;

-

-      loc.first_line = 0;

-      loc.first_column = 0;

-      loc.position = len;

-

-      yyerror(& loc, state, "invalid PARAM usage");

-      goto error;

-   }

-

-

-   

-   /* Add one instruction to store the "END" instruction.

-    */

-   state->prog->Instructions =

-      _mesa_alloc_instructions(state->prog->NumInstructions + 1);

-   inst = state->inst_head;

-   for (i = 0; i < state->prog->NumInstructions; i++) {

-      struct asm_instruction *const temp = inst->next;

-

-      state->prog->Instructions[i] = inst->Base;

-      inst = temp;

-   }

-

-   /* Finally, tag on an OPCODE_END instruction */

-   {

-      const GLuint numInst = state->prog->NumInstructions;

-      _mesa_init_instructions(state->prog->Instructions + numInst, 1);

-      state->prog->Instructions[numInst].Opcode = OPCODE_END;

-   }

-   state->prog->NumInstructions++;

-

-   state->prog->NumParameters = state->prog->Parameters->NumParameters;

-   state->prog->NumAttributes = _mesa_bitcount(state->prog->InputsRead);

-

-   /*

-    * Initialize native counts to logical counts.  The device driver may

-    * change them if program is translated into a hardware program.

-    */

-   state->prog->NumNativeInstructions = state->prog->NumInstructions;

-   state->prog->NumNativeTemporaries = state->prog->NumTemporaries;

-   state->prog->NumNativeParameters = state->prog->NumParameters;

-   state->prog->NumNativeAttributes = state->prog->NumAttributes;

-   state->prog->NumNativeAddressRegs = state->prog->NumAddressRegs;

-

-   result = GL_TRUE;

-

-error:

-   for (inst = state->inst_head; inst != NULL; inst = temp) {

-      temp = inst->next;

-      free(inst);

-   }

-

-   state->inst_head = NULL;

-   state->inst_tail = NULL;

-

-   for (sym = state->sym; sym != NULL; sym = temp) {

-      temp = sym->next;

-

-      free((void *) sym->name);

-      free(sym);

-   }

-   state->sym = NULL;

-

-   _mesa_symbol_table_dtor(state->st);

-   state->st = NULL;

-

-   return result;

-}

+%{
+/*
+ * Copyright © 2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "main/mtypes.h"
+#include "main/imports.h"
+#include "program/program.h"
+#include "program/prog_parameter.h"
+#include "program/prog_parameter_layout.h"
+#include "program/prog_statevars.h"
+#include "program/prog_instruction.h"
+
+#include "program/symbol_table.h"
+#include "program/program_parser.h"
+
+extern void *yy_scan_string(char *);
+extern void yy_delete_buffer(void *);
+
+static struct asm_symbol *declare_variable(struct asm_parser_state *state,
+    char *name, enum asm_type t, struct YYLTYPE *locp);
+
+static int add_state_reference(struct gl_program_parameter_list *param_list,
+    const gl_state_index tokens[STATE_LENGTH]);
+
+static int initialize_symbol_from_state(struct gl_program *prog,
+    struct asm_symbol *param_var, const gl_state_index tokens[STATE_LENGTH]);
+
+static int initialize_symbol_from_param(struct gl_program *prog,
+    struct asm_symbol *param_var, const gl_state_index tokens[STATE_LENGTH]);
+
+static int initialize_symbol_from_const(struct gl_program *prog,
+    struct asm_symbol *param_var, const struct asm_vector *vec,
+    GLboolean allowSwizzle);
+
+static int yyparse(struct asm_parser_state *state);
+
+static char *make_error_string(const char *fmt, ...);
+
+static void yyerror(struct YYLTYPE *locp, struct asm_parser_state *state,
+    const char *s);
+
+static int validate_inputs(struct YYLTYPE *locp,
+    struct asm_parser_state *state);
+
+static void init_dst_reg(struct prog_dst_register *r);
+
+static void set_dst_reg(struct prog_dst_register *r,
+                        gl_register_file file, GLint index);
+
+static void init_src_reg(struct asm_src_register *r);
+
+static void set_src_reg(struct asm_src_register *r,
+                        gl_register_file file, GLint index);
+
+static void set_src_reg_swz(struct asm_src_register *r,
+                            gl_register_file file, GLint index, GLuint swizzle);
+
+static void asm_instruction_set_operands(struct asm_instruction *inst,
+    const struct prog_dst_register *dst, const struct asm_src_register *src0,
+    const struct asm_src_register *src1, const struct asm_src_register *src2);
+
+static struct asm_instruction *asm_instruction_ctor(gl_inst_opcode op,
+    const struct prog_dst_register *dst, const struct asm_src_register *src0,
+    const struct asm_src_register *src1, const struct asm_src_register *src2);
+
+static struct asm_instruction *asm_instruction_copy_ctor(
+    const struct prog_instruction *base, const struct prog_dst_register *dst,
+    const struct asm_src_register *src0, const struct asm_src_register *src1,
+    const struct asm_src_register *src2);
+
+#ifndef FALSE
+#define FALSE 0
+#define TRUE (!FALSE)
+#endif
+
+#define YYLLOC_DEFAULT(Current, Rhs, N)					\
+   do {									\
+      if (YYID(N)) {							\
+	 (Current).first_line = YYRHSLOC(Rhs, 1).first_line;		\
+	 (Current).first_column = YYRHSLOC(Rhs, 1).first_column;	\
+	 (Current).position = YYRHSLOC(Rhs, 1).position;		\
+	 (Current).last_line = YYRHSLOC(Rhs, N).last_line;		\
+	 (Current).last_column = YYRHSLOC(Rhs, N).last_column;		\
+      } else {								\
+	 (Current).first_line = YYRHSLOC(Rhs, 0).last_line;		\
+	 (Current).last_line = (Current).first_line;			\
+	 (Current).first_column = YYRHSLOC(Rhs, 0).last_column;		\
+	 (Current).last_column = (Current).first_column;		\
+	 (Current).position = YYRHSLOC(Rhs, 0).position			\
+	    + (Current).first_column;					\
+      }									\
+   } while(YYID(0))
+
+#define YYLEX_PARAM state->scanner
+%}
+
+%pure-parser
+%locations
+%parse-param { struct asm_parser_state *state }
+%error-verbose
+%lex-param { void *scanner }
+
+%union {
+   struct asm_instruction *inst;
+   struct asm_symbol *sym;
+   struct asm_symbol temp_sym;
+   struct asm_swizzle_mask swiz_mask;
+   struct asm_src_register src_reg;
+   struct prog_dst_register dst_reg;
+   struct prog_instruction temp_inst;
+   char *string;
+   unsigned result;
+   unsigned attrib;
+   int integer;
+   float real;
+   gl_state_index state[STATE_LENGTH];
+   int negate;
+   struct asm_vector vector;
+   gl_inst_opcode opcode;
+
+   struct {
+      unsigned swz;
+      unsigned rgba_valid:1;
+      unsigned xyzw_valid:1;
+      unsigned negate:1;
+   } ext_swizzle;
+}
+
+%token ARBvp_10 ARBfp_10
+
+/* Tokens for assembler pseudo-ops */
+%token <integer> ADDRESS
+%token ALIAS ATTRIB
+%token OPTION OUTPUT
+%token PARAM
+%token <integer> TEMP
+%token END
+
+ /* Tokens for instructions */
+%token <temp_inst> BIN_OP BINSC_OP SAMPLE_OP SCALAR_OP TRI_OP VECTOR_OP
+%token <temp_inst> ARL KIL SWZ TXD_OP
+
+%token <integer> INTEGER
+%token <real> REAL
+
+%token AMBIENT ATTENUATION
+%token BACK
+%token CLIP COLOR
+%token DEPTH DIFFUSE DIRECTION
+%token EMISSION ENV EYE
+%token FOG FOGCOORD FRAGMENT FRONT
+%token HALF
+%token INVERSE INVTRANS
+%token LIGHT LIGHTMODEL LIGHTPROD LOCAL
+%token MATERIAL MAT_PROGRAM MATRIX MATRIXINDEX MODELVIEW MVP
+%token NORMAL
+%token OBJECT
+%token PALETTE PARAMS PLANE POINT_TOK POINTSIZE POSITION PRIMARY PROGRAM PROJECTION
+%token RANGE RESULT ROW
+%token SCENECOLOR SECONDARY SHININESS SIZE_TOK SPECULAR SPOT STATE
+%token TEXCOORD TEXENV TEXGEN TEXGEN_Q TEXGEN_R TEXGEN_S TEXGEN_T TEXTURE TRANSPOSE
+%token TEXTURE_UNIT TEX_1D TEX_2D TEX_3D TEX_CUBE TEX_RECT
+%token TEX_SHADOW1D TEX_SHADOW2D TEX_SHADOWRECT
+%token TEX_ARRAY1D TEX_ARRAY2D TEX_ARRAYSHADOW1D TEX_ARRAYSHADOW2D 
+%token VERTEX VTXATTRIB
+%token WEIGHT
+
+%token <string> IDENTIFIER USED_IDENTIFIER
+%type <string> string
+%token <swiz_mask> MASK4 MASK3 MASK2 MASK1 SWIZZLE
+%token DOT_DOT
+%token DOT
+
+%type <inst> instruction ALU_instruction TexInstruction
+%type <inst> ARL_instruction VECTORop_instruction
+%type <inst> SCALARop_instruction BINSCop_instruction BINop_instruction
+%type <inst> TRIop_instruction TXD_instruction SWZ_instruction SAMPLE_instruction
+%type <inst> KIL_instruction
+
+%type <dst_reg> dstReg maskedDstReg maskedAddrReg
+%type <src_reg> srcReg scalarUse scalarSrcReg swizzleSrcReg
+%type <swiz_mask> scalarSuffix swizzleSuffix extendedSwizzle
+%type <ext_swizzle> extSwizComp extSwizSel
+%type <swiz_mask> optionalMask
+
+%type <sym> progParamArray
+%type <integer> addrRegRelOffset addrRegPosOffset addrRegNegOffset
+%type <src_reg> progParamArrayMem progParamArrayAbs progParamArrayRel
+%type <sym> addrReg
+%type <swiz_mask> addrComponent addrWriteMask
+
+%type <dst_reg> ccMaskRule ccTest ccMaskRule2 ccTest2 optionalCcMask
+
+%type <result> resultBinding resultColBinding
+%type <integer> optFaceType optColorType
+%type <integer> optResultFaceType optResultColorType
+
+%type <integer> optTexImageUnitNum texImageUnitNum
+%type <integer> optTexCoordUnitNum texCoordUnitNum
+%type <integer> optLegacyTexUnitNum legacyTexUnitNum
+%type <integer> texImageUnit texTarget
+%type <integer> vtxAttribNum
+
+%type <attrib> attribBinding vtxAttribItem fragAttribItem
+
+%type <temp_sym> paramSingleInit paramSingleItemDecl
+%type <integer> optArraySize
+
+%type <state> stateSingleItem stateMultipleItem
+%type <state> stateMaterialItem
+%type <state> stateLightItem stateLightModelItem stateLightProdItem
+%type <state> stateTexGenItem stateFogItem stateClipPlaneItem statePointItem
+%type <state> stateMatrixItem stateMatrixRow stateMatrixRows
+%type <state> stateTexEnvItem stateDepthItem
+
+%type <state> stateLModProperty
+%type <state> stateMatrixName optMatrixRows
+
+%type <integer> stateMatProperty
+%type <integer> stateLightProperty stateSpotProperty
+%type <integer> stateLightNumber stateLProdProperty
+%type <integer> stateTexGenType stateTexGenCoord
+%type <integer> stateTexEnvProperty
+%type <integer> stateFogProperty
+%type <integer> stateClipPlaneNum
+%type <integer> statePointProperty
+
+%type <integer> stateOptMatModifier stateMatModifier stateMatrixRowNum
+%type <integer> stateOptModMatNum stateModMatNum statePaletteMatNum 
+%type <integer> stateProgramMatNum
+
+%type <integer> ambDiffSpecProperty
+
+%type <state> programSingleItem progEnvParam progLocalParam
+%type <state> programMultipleItem progEnvParams progLocalParams
+
+%type <temp_sym> paramMultipleInit paramMultInitList paramMultipleItem
+%type <temp_sym> paramSingleItemUse
+
+%type <integer> progEnvParamNum progLocalParamNum
+%type <state> progEnvParamNums progLocalParamNums
+
+%type <vector> paramConstDecl paramConstUse
+%type <vector> paramConstScalarDecl paramConstScalarUse paramConstVector
+%type <real> signedFloatConstant
+%type <negate> optionalSign
+
+%{
+extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
+    void *yyscanner);
+%}
+
+%%
+
+program: language optionSequence statementSequence END
+	;
+
+language: ARBvp_10
+	{
+	   if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {
+	      yyerror(& @1, state, "invalid fragment program header");
+
+	   }
+	   state->mode = ARB_vertex;
+	}
+	| ARBfp_10
+	{
+	   if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {
+	      yyerror(& @1, state, "invalid vertex program header");
+	   }
+	   state->mode = ARB_fragment;
+
+	   state->option.TexRect =
+	      (state->ctx->Extensions.NV_texture_rectangle != GL_FALSE);
+	}
+	;
+
+optionSequence: optionSequence option
+	|
+	;
+
+option: OPTION string ';'
+	{
+	   int valid = 0;
+
+	   if (state->mode == ARB_vertex) {
+	      valid = _mesa_ARBvp_parse_option(state, $2);
+	   } else if (state->mode == ARB_fragment) {
+	      valid = _mesa_ARBfp_parse_option(state, $2);
+	   }
+
+
+	   free($2);
+
+	   if (!valid) {
+	      const char *const err_str = (state->mode == ARB_vertex)
+		 ? "invalid ARB vertex program option"
+		 : "invalid ARB fragment program option";
+
+	      yyerror(& @2, state, err_str);
+	      YYERROR;
+	   }
+	}
+	;
+
+statementSequence: statementSequence statement
+	|
+	;
+
+statement: instruction ';'
+	{
+	   if ($1 != NULL) {
+	      if (state->inst_tail == NULL) {
+		 state->inst_head = $1;
+	      } else {
+		 state->inst_tail->next = $1;
+	      }
+
+	      state->inst_tail = $1;
+	      $1->next = NULL;
+
+	      state->prog->NumInstructions++;
+	   }
+	}
+	| namingStatement ';'
+	;
+
+instruction: ALU_instruction
+	{
+	   $$ = $1;
+	   state->prog->NumAluInstructions++;
+	}
+	| TexInstruction
+	{
+	   $$ = $1;
+	   state->prog->NumTexInstructions++;
+	}
+	;
+
+ALU_instruction: ARL_instruction
+	| VECTORop_instruction
+	| SCALARop_instruction
+	| BINSCop_instruction
+	| BINop_instruction
+	| TRIop_instruction
+	| SWZ_instruction
+	;
+
+TexInstruction: SAMPLE_instruction
+	| KIL_instruction
+	| TXD_instruction
+	;
+
+ARL_instruction: ARL maskedAddrReg ',' scalarSrcReg
+	{
+	   $$ = asm_instruction_ctor(OPCODE_ARL, & $2, & $4, NULL, NULL);
+	}
+	;
+
+VECTORop_instruction: VECTOR_OP maskedDstReg ',' swizzleSrcReg
+	{
+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
+	}
+	;
+
+SCALARop_instruction: SCALAR_OP maskedDstReg ',' scalarSrcReg
+	{
+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
+	}
+	;
+
+BINSCop_instruction: BINSC_OP maskedDstReg ',' scalarSrcReg ',' scalarSrcReg
+	{
+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, NULL);
+	}
+	;
+
+
+BINop_instruction: BIN_OP maskedDstReg ',' swizzleSrcReg ',' swizzleSrcReg
+	{
+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, NULL);
+	}
+	;
+
+TRIop_instruction: TRI_OP maskedDstReg ','
+                   swizzleSrcReg ',' swizzleSrcReg ',' swizzleSrcReg
+	{
+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, & $8);
+	}
+	;
+
+SAMPLE_instruction: SAMPLE_OP maskedDstReg ',' swizzleSrcReg ',' texImageUnit ',' texTarget
+	{
+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
+	   if ($$ != NULL) {
+	      const GLbitfield tex_mask = (1U << $6);
+	      GLbitfield shadow_tex = 0;
+	      GLbitfield target_mask = 0;
+
+
+	      $$->Base.TexSrcUnit = $6;
+
+	      if ($8 < 0) {
+		 shadow_tex = tex_mask;
+
+		 $$->Base.TexSrcTarget = -$8;
+		 $$->Base.TexShadow = 1;
+	      } else {
+		 $$->Base.TexSrcTarget = $8;
+	      }
+
+	      target_mask = (1U << $$->Base.TexSrcTarget);
+
+	      /* If this texture unit was previously accessed and that access
+	       * had a different texture target, generate an error.
+	       *
+	       * If this texture unit was previously accessed and that access
+	       * had a different shadow mode, generate an error.
+	       */
+	      if ((state->prog->TexturesUsed[$6] != 0)
+		  && ((state->prog->TexturesUsed[$6] != target_mask)
+		      || ((state->prog->ShadowSamplers & tex_mask)
+			  != shadow_tex))) {
+		 yyerror(& @8, state,
+			 "multiple targets used on one texture image unit");
+		 YYERROR;
+	      }
+
+
+	      state->prog->TexturesUsed[$6] |= target_mask;
+	      state->prog->ShadowSamplers |= shadow_tex;
+	   }
+	}
+	;
+
+KIL_instruction: KIL swizzleSrcReg
+	{
+	   $$ = asm_instruction_ctor(OPCODE_KIL, NULL, & $2, NULL, NULL);
+	   state->fragment.UsesKill = 1;
+	}
+	| KIL ccTest
+	{
+	   $$ = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);
+	   $$->Base.DstReg.CondMask = $2.CondMask;
+	   $$->Base.DstReg.CondSwizzle = $2.CondSwizzle;
+	   $$->Base.DstReg.CondSrc = $2.CondSrc;
+	   state->fragment.UsesKill = 1;
+	}
+	;
+
+TXD_instruction: TXD_OP maskedDstReg ',' swizzleSrcReg ',' swizzleSrcReg ',' swizzleSrcReg ',' texImageUnit ',' texTarget
+	{
+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, & $6, & $8);
+	   if ($$ != NULL) {
+	      const GLbitfield tex_mask = (1U << $10);
+	      GLbitfield shadow_tex = 0;
+	      GLbitfield target_mask = 0;
+
+
+	      $$->Base.TexSrcUnit = $10;
+
+	      if ($12 < 0) {
+		 shadow_tex = tex_mask;
+
+		 $$->Base.TexSrcTarget = -$12;
+		 $$->Base.TexShadow = 1;
+	      } else {
+		 $$->Base.TexSrcTarget = $12;
+	      }
+
+	      target_mask = (1U << $$->Base.TexSrcTarget);
+
+	      /* If this texture unit was previously accessed and that access
+	       * had a different texture target, generate an error.
+	       *
+	       * If this texture unit was previously accessed and that access
+	       * had a different shadow mode, generate an error.
+	       */
+	      if ((state->prog->TexturesUsed[$10] != 0)
+		  && ((state->prog->TexturesUsed[$10] != target_mask)
+		      || ((state->prog->ShadowSamplers & tex_mask)
+			  != shadow_tex))) {
+		 yyerror(& @12, state,
+			 "multiple targets used on one texture image unit");
+		 YYERROR;
+	      }
+
+
+	      state->prog->TexturesUsed[$10] |= target_mask;
+	      state->prog->ShadowSamplers |= shadow_tex;
+	   }
+	}
+	;
+
+texImageUnit: TEXTURE_UNIT optTexImageUnitNum
+	{
+	   $$ = $2;
+	}
+	;
+
+texTarget: TEX_1D  { $$ = TEXTURE_1D_INDEX; }
+	| TEX_2D   { $$ = TEXTURE_2D_INDEX; }
+	| TEX_3D   { $$ = TEXTURE_3D_INDEX; }
+	| TEX_CUBE { $$ = TEXTURE_CUBE_INDEX; }
+	| TEX_RECT { $$ = TEXTURE_RECT_INDEX; }
+	| TEX_SHADOW1D   { $$ = -TEXTURE_1D_INDEX; }
+	| TEX_SHADOW2D   { $$ = -TEXTURE_2D_INDEX; }
+	| TEX_SHADOWRECT { $$ = -TEXTURE_RECT_INDEX; }
+	| TEX_ARRAY1D         { $$ = TEXTURE_1D_ARRAY_INDEX; }
+	| TEX_ARRAY2D         { $$ = TEXTURE_2D_ARRAY_INDEX; }
+	| TEX_ARRAYSHADOW1D   { $$ = -TEXTURE_1D_ARRAY_INDEX; }
+	| TEX_ARRAYSHADOW2D   { $$ = -TEXTURE_2D_ARRAY_INDEX; }
+	;
+
+SWZ_instruction: SWZ maskedDstReg ',' srcReg ',' extendedSwizzle
+	{
+	   /* FIXME: Is this correct?  Should the extenedSwizzle be applied
+	    * FIXME: to the existing swizzle?
+	    */
+	   $4.Base.Swizzle = $6.swizzle;
+	   $4.Base.Negate = $6.mask;
+
+	   $$ = asm_instruction_copy_ctor(& $1, & $2, & $4, NULL, NULL);
+	}
+	;
+
+scalarSrcReg: optionalSign scalarUse
+	{
+	   $$ = $2;
+
+	   if ($1) {
+	      $$.Base.Negate = ~$$.Base.Negate;
+	   }
+	}
+	| optionalSign '|' scalarUse '|'
+	{
+	   $$ = $3;
+
+	   if (!state->option.NV_fragment) {
+	      yyerror(& @2, state, "unexpected character '|'");
+	      YYERROR;
+	   }
+
+	   if ($1) {
+	      $$.Base.Negate = ~$$.Base.Negate;
+	   }
+
+	   $$.Base.Abs = 1;
+	}
+	;
+
+scalarUse:  srcReg scalarSuffix
+	{
+	   $$ = $1;
+
+	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,
+						    $2.swizzle);
+	}
+	| paramConstScalarUse
+	{
+	   struct asm_symbol temp_sym;
+
+	   if (!state->option.NV_fragment) {
+	      yyerror(& @1, state, "expected scalar suffix");
+	      YYERROR;
+	   }
+
+	   memset(& temp_sym, 0, sizeof(temp_sym));
+	   temp_sym.param_binding_begin = ~0;
+	   initialize_symbol_from_const(state->prog, & temp_sym, & $1, GL_TRUE);
+
+	   set_src_reg_swz(& $$, PROGRAM_CONSTANT,
+                           temp_sym.param_binding_begin,
+                           temp_sym.param_binding_swizzle);
+	}
+	;
+
+swizzleSrcReg: optionalSign srcReg swizzleSuffix
+	{
+	   $$ = $2;
+
+	   if ($1) {
+	      $$.Base.Negate = ~$$.Base.Negate;
+	   }
+
+	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,
+						    $3.swizzle);
+	}
+	| optionalSign '|' srcReg swizzleSuffix '|'
+	{
+	   $$ = $3;
+
+	   if (!state->option.NV_fragment) {
+	      yyerror(& @2, state, "unexpected character '|'");
+	      YYERROR;
+	   }
+
+	   if ($1) {
+	      $$.Base.Negate = ~$$.Base.Negate;
+	   }
+
+	   $$.Base.Abs = 1;
+	   $$.Base.Swizzle = _mesa_combine_swizzles($$.Base.Swizzle,
+						    $4.swizzle);
+	}
+
+	;
+
+maskedDstReg: dstReg optionalMask optionalCcMask
+	{
+	   $$ = $1;
+	   $$.WriteMask = $2.mask;
+	   $$.CondMask = $3.CondMask;
+	   $$.CondSwizzle = $3.CondSwizzle;
+	   $$.CondSrc = $3.CondSrc;
+
+	   if ($$.File == PROGRAM_OUTPUT) {
+	      /* Technically speaking, this should check that it is in
+	       * vertex program mode.  However, PositionInvariant can never be
+	       * set in fragment program mode, so it is somewhat irrelevant.
+	       */
+	      if (state->option.PositionInvariant
+	       && ($$.Index == VERT_RESULT_HPOS)) {
+		 yyerror(& @1, state, "position-invariant programs cannot "
+			 "write position");
+		 YYERROR;
+	      }
+
+	      state->prog->OutputsWritten |= BITFIELD64_BIT($$.Index);
+	   }
+	}
+	;
+
+maskedAddrReg: addrReg addrWriteMask
+	{
+	   set_dst_reg(& $$, PROGRAM_ADDRESS, 0);
+	   $$.WriteMask = $2.mask;
+	}
+	;
+
+extendedSwizzle: extSwizComp ',' extSwizComp ',' extSwizComp ',' extSwizComp
+	{
+	   const unsigned xyzw_valid =
+	      ($1.xyzw_valid << 0)
+	      | ($3.xyzw_valid << 1)
+	      | ($5.xyzw_valid << 2)
+	      | ($7.xyzw_valid << 3);
+	   const unsigned rgba_valid =
+	      ($1.rgba_valid << 0)
+	      | ($3.rgba_valid << 1)
+	      | ($5.rgba_valid << 2)
+	      | ($7.rgba_valid << 3);
+
+	   /* All of the swizzle components have to be valid in either RGBA
+	    * or XYZW.  Note that 0 and 1 are valid in both, so both masks
+	    * can have some bits set.
+	    *
+	    * We somewhat deviate from the spec here.  It would be really hard
+	    * to figure out which component is the error, and there probably
+	    * isn't a lot of benefit.
+	    */
+	   if ((rgba_valid != 0x0f) && (xyzw_valid != 0x0f)) {
+	      yyerror(& @1, state, "cannot combine RGBA and XYZW swizzle "
+		      "components");
+	      YYERROR;
+	   }
+
+	   $$.swizzle = MAKE_SWIZZLE4($1.swz, $3.swz, $5.swz, $7.swz);
+	   $$.mask = ($1.negate) | ($3.negate << 1) | ($5.negate << 2)
+	      | ($7.negate << 3);
+	}
+	;
+
+extSwizComp: optionalSign extSwizSel
+	{
+	   $$ = $2;
+	   $$.negate = ($1) ? 1 : 0;
+	}
+	;
+
+extSwizSel: INTEGER
+	{
+	   if (($1 != 0) && ($1 != 1)) {
+	      yyerror(& @1, state, "invalid extended swizzle selector");
+	      YYERROR;
+	   }
+
+	   $$.swz = ($1 == 0) ? SWIZZLE_ZERO : SWIZZLE_ONE;
+
+	   /* 0 and 1 are valid for both RGBA swizzle names and XYZW
+	    * swizzle names.
+	    */
+	   $$.xyzw_valid = 1;
+	   $$.rgba_valid = 1;
+	}
+	| string
+	{
+	   char s;
+
+	   if (strlen($1) > 1) {
+	      yyerror(& @1, state, "invalid extended swizzle selector");
+	      YYERROR;
+	   }
+
+	   s = $1[0];
+	   free($1);
+
+	   switch (s) {
+	   case 'x':
+	      $$.swz = SWIZZLE_X;
+	      $$.xyzw_valid = 1;
+	      break;
+	   case 'y':
+	      $$.swz = SWIZZLE_Y;
+	      $$.xyzw_valid = 1;
+	      break;
+	   case 'z':
+	      $$.swz = SWIZZLE_Z;
+	      $$.xyzw_valid = 1;
+	      break;
+	   case 'w':
+	      $$.swz = SWIZZLE_W;
+	      $$.xyzw_valid = 1;
+	      break;
+
+	   case 'r':
+	      $$.swz = SWIZZLE_X;
+	      $$.rgba_valid = 1;
+	      break;
+	   case 'g':
+	      $$.swz = SWIZZLE_Y;
+	      $$.rgba_valid = 1;
+	      break;
+	   case 'b':
+	      $$.swz = SWIZZLE_Z;
+	      $$.rgba_valid = 1;
+	      break;
+	   case 'a':
+	      $$.swz = SWIZZLE_W;
+	      $$.rgba_valid = 1;
+	      break;
+
+	   default:
+	      yyerror(& @1, state, "invalid extended swizzle selector");
+	      YYERROR;
+	      break;
+	   }
+	}
+	;
+
+srcReg: USED_IDENTIFIER /* temporaryReg | progParamSingle */
+	{
+	   struct asm_symbol *const s = (struct asm_symbol *)
+	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
+
+	   free($1);
+
+	   if (s == NULL) {
+	      yyerror(& @1, state, "invalid operand variable");
+	      YYERROR;
+	   } else if ((s->type != at_param) && (s->type != at_temp)
+		      && (s->type != at_attrib)) {
+	      yyerror(& @1, state, "invalid operand variable");
+	      YYERROR;
+	   } else if ((s->type == at_param) && s->param_is_array) {
+	      yyerror(& @1, state, "non-array access to array PARAM");
+	      YYERROR;
+	   }
+
+	   init_src_reg(& $$);
+	   switch (s->type) {
+	   case at_temp:
+	      set_src_reg(& $$, PROGRAM_TEMPORARY, s->temp_binding);
+	      break;
+	   case at_param:
+              set_src_reg_swz(& $$, s->param_binding_type,
+                              s->param_binding_begin,
+                              s->param_binding_swizzle);
+	      break;
+	   case at_attrib:
+	      set_src_reg(& $$, PROGRAM_INPUT, s->attrib_binding);
+	      state->prog->InputsRead |= (1U << $$.Base.Index);
+
+	      if (!validate_inputs(& @1, state)) {
+		 YYERROR;
+	      }
+	      break;
+
+	   default:
+	      YYERROR;
+	      break;
+	   }
+	}
+	| attribBinding
+	{
+	   set_src_reg(& $$, PROGRAM_INPUT, $1);
+	   state->prog->InputsRead |= (1U << $$.Base.Index);
+
+	   if (!validate_inputs(& @1, state)) {
+	      YYERROR;
+	   }
+	}
+	| progParamArray '[' progParamArrayMem ']'
+	{
+	   if (! $3.Base.RelAddr
+	       && ((unsigned) $3.Base.Index >= $1->param_binding_length)) {
+	      yyerror(& @3, state, "out of bounds array access");
+	      YYERROR;
+	   }
+
+	   init_src_reg(& $$);
+	   $$.Base.File = $1->param_binding_type;
+
+	   if ($3.Base.RelAddr) {
+              state->prog->IndirectRegisterFiles |= (1 << $$.Base.File);
+	      $1->param_accessed_indirectly = 1;
+
+	      $$.Base.RelAddr = 1;
+	      $$.Base.Index = $3.Base.Index;
+	      $$.Symbol = $1;
+	   } else {
+	      $$.Base.Index = $1->param_binding_begin + $3.Base.Index;
+	   }
+	}
+	| paramSingleItemUse
+	{
+           gl_register_file file = ($1.name != NULL) 
+	      ? $1.param_binding_type
+	      : PROGRAM_CONSTANT;
+           set_src_reg_swz(& $$, file, $1.param_binding_begin,
+                           $1.param_binding_swizzle);
+	}
+	;
+
+dstReg: resultBinding
+	{
+	   set_dst_reg(& $$, PROGRAM_OUTPUT, $1);
+	}
+	| USED_IDENTIFIER /* temporaryReg | vertexResultReg */
+	{
+	   struct asm_symbol *const s = (struct asm_symbol *)
+	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
+
+	   free($1);
+
+	   if (s == NULL) {
+	      yyerror(& @1, state, "invalid operand variable");
+	      YYERROR;
+	   } else if ((s->type != at_output) && (s->type != at_temp)) {
+	      yyerror(& @1, state, "invalid operand variable");
+	      YYERROR;
+	   }
+
+	   switch (s->type) {
+	   case at_temp:
+	      set_dst_reg(& $$, PROGRAM_TEMPORARY, s->temp_binding);
+	      break;
+	   case at_output:
+	      set_dst_reg(& $$, PROGRAM_OUTPUT, s->output_binding);
+	      break;
+	   default:
+	      set_dst_reg(& $$, s->param_binding_type, s->param_binding_begin);
+	      break;
+	   }
+	}
+	;
+
+progParamArray: USED_IDENTIFIER
+	{
+	   struct asm_symbol *const s = (struct asm_symbol *)
+	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
+
+	   free($1);
+
+	   if (s == NULL) {
+	      yyerror(& @1, state, "invalid operand variable");
+	      YYERROR;
+	   } else if ((s->type != at_param) || !s->param_is_array) {
+	      yyerror(& @1, state, "array access to non-PARAM variable");
+	      YYERROR;
+	   } else {
+	      $$ = s;
+	   }
+	}
+	;
+
+progParamArrayMem: progParamArrayAbs | progParamArrayRel;
+
+progParamArrayAbs: INTEGER
+	{
+	   init_src_reg(& $$);
+	   $$.Base.Index = $1;
+	}
+	;
+
+progParamArrayRel: addrReg addrComponent addrRegRelOffset
+	{
+	   /* FINISHME: Add support for multiple address registers.
+	    */
+	   /* FINISHME: Add support for 4-component address registers.
+	    */
+	   init_src_reg(& $$);
+	   $$.Base.RelAddr = 1;
+	   $$.Base.Index = $3;
+	}
+	;
+
+addrRegRelOffset:              { $$ = 0; }
+	| '+' addrRegPosOffset { $$ = $2; }
+	| '-' addrRegNegOffset { $$ = -$2; }
+	;
+
+addrRegPosOffset: INTEGER
+	{
+	   if (($1 < 0) || ($1 > (state->limits->MaxAddressOffset - 1))) {
+              char s[100];
+              _mesa_snprintf(s, sizeof(s),
+                             "relative address offset too large (%d)", $1);
+	      yyerror(& @1, state, s);
+	      YYERROR;
+	   } else {
+	      $$ = $1;
+	   }
+	}
+	;
+
+addrRegNegOffset: INTEGER
+	{
+	   if (($1 < 0) || ($1 > state->limits->MaxAddressOffset)) {
+              char s[100];
+              _mesa_snprintf(s, sizeof(s),
+                             "relative address offset too large (%d)", $1);
+	      yyerror(& @1, state, s);
+	      YYERROR;
+	   } else {
+	      $$ = $1;
+	   }
+	}
+	;
+
+addrReg: USED_IDENTIFIER
+	{
+	   struct asm_symbol *const s = (struct asm_symbol *)
+	      _mesa_symbol_table_find_symbol(state->st, 0, $1);
+
+	   free($1);
+
+	   if (s == NULL) {
+	      yyerror(& @1, state, "invalid array member");
+	      YYERROR;
+	   } else if (s->type != at_address) {
+	      yyerror(& @1, state,
+		      "invalid variable for indexed array access");
+	      YYERROR;
+	   } else {
+	      $$ = s;
+	   }
+	}
+	;
+
+addrComponent: MASK1
+	{
+	   if ($1.mask != WRITEMASK_X) {
+	      yyerror(& @1, state, "invalid address component selector");
+	      YYERROR;
+	   } else {
+	      $$ = $1;
+	   }
+	}
+	;
+
+addrWriteMask: MASK1
+	{
+	   if ($1.mask != WRITEMASK_X) {
+	      yyerror(& @1, state,
+		      "address register write mask must be \".x\"");
+	      YYERROR;
+	   } else {
+	      $$ = $1;
+	   }
+	}
+	;
+
+scalarSuffix: MASK1;
+
+swizzleSuffix: MASK1
+	| MASK4
+	| SWIZZLE
+	|              { $$.swizzle = SWIZZLE_NOOP; $$.mask = WRITEMASK_XYZW; }
+	;
+
+optionalMask: MASK4 | MASK3 | MASK2 | MASK1 
+	|              { $$.swizzle = SWIZZLE_NOOP; $$.mask = WRITEMASK_XYZW; }
+	;
+
+optionalCcMask: '(' ccTest ')'
+	{
+	   $$ = $2;
+	}
+	| '(' ccTest2 ')'
+	{
+	   $$ = $2;
+	}
+	|
+	{
+	   $$.CondMask = COND_TR;
+	   $$.CondSwizzle = SWIZZLE_NOOP;
+	   $$.CondSrc = 0;
+	}
+	;
+
+ccTest: ccMaskRule swizzleSuffix
+	{
+	   $$ = $1;
+	   $$.CondSwizzle = $2.swizzle;
+	}
+	;
+
+ccTest2: ccMaskRule2 swizzleSuffix
+	{
+	   $$ = $1;
+	   $$.CondSwizzle = $2.swizzle;
+	}
+	;
+
+ccMaskRule: IDENTIFIER
+	{
+	   const int cond = _mesa_parse_cc($1);
+	   if ((cond == 0) || ($1[2] != '\0')) {
+	      char *const err_str =
+		 make_error_string("invalid condition code \"%s\"", $1);
+
+	      yyerror(& @1, state, (err_str != NULL)
+		      ? err_str : "invalid condition code");
+
+	      if (err_str != NULL) {
+		 free(err_str);
+	      }
+
+	      YYERROR;
+	   }
+
+	   $$.CondMask = cond;
+	   $$.CondSwizzle = SWIZZLE_NOOP;
+	   $$.CondSrc = 0;
+	}
+	;
+
+ccMaskRule2: USED_IDENTIFIER
+	{
+	   const int cond = _mesa_parse_cc($1);
+	   if ((cond == 0) || ($1[2] != '\0')) {
+	      char *const err_str =
+		 make_error_string("invalid condition code \"%s\"", $1);
+
+	      yyerror(& @1, state, (err_str != NULL)
+		      ? err_str : "invalid condition code");
+
+	      if (err_str != NULL) {
+		 free(err_str);
+	      }
+
+	      YYERROR;
+	   }
+
+	   $$.CondMask = cond;
+	   $$.CondSwizzle = SWIZZLE_NOOP;
+	   $$.CondSrc = 0;
+	}
+	;
+
+namingStatement: ATTRIB_statement
+	| PARAM_statement
+	| TEMP_statement
+	| ADDRESS_statement
+	| OUTPUT_statement
+	| ALIAS_statement
+	;
+
+ATTRIB_statement: ATTRIB IDENTIFIER '=' attribBinding
+	{
+	   struct asm_symbol *const s =
+	      declare_variable(state, $2, at_attrib, & @2);
+
+	   if (s == NULL) {
+	      free($2);
+	      YYERROR;
+	   } else {
+	      s->attrib_binding = $4;
+	      state->InputsBound |= (1U << s->attrib_binding);
+
+	      if (!validate_inputs(& @4, state)) {
+		 YYERROR;
+	      }
+	   }
+	}
+	;
+
+attribBinding: VERTEX vtxAttribItem
+	{
+	   $$ = $2;
+	}
+	| FRAGMENT fragAttribItem
+	{
+	   $$ = $2;
+	}
+	;
+
+vtxAttribItem: POSITION
+	{
+	   $$ = VERT_ATTRIB_POS;
+	}
+	| WEIGHT vtxOptWeightNum
+	{
+	   $$ = VERT_ATTRIB_WEIGHT;
+	}
+	| NORMAL
+	{
+	   $$ = VERT_ATTRIB_NORMAL;
+	}
+	| COLOR optColorType
+	{
+	   if (!state->ctx->Extensions.EXT_secondary_color) {
+	      yyerror(& @2, state, "GL_EXT_secondary_color not supported");
+	      YYERROR;
+	   }
+
+	   $$ = VERT_ATTRIB_COLOR0 + $2;
+	}
+	| FOGCOORD
+	{
+	   if (!state->ctx->Extensions.EXT_fog_coord) {
+	      yyerror(& @1, state, "GL_EXT_fog_coord not supported");
+	      YYERROR;
+	   }
+
+	   $$ = VERT_ATTRIB_FOG;
+	}
+	| TEXCOORD optTexCoordUnitNum
+	{
+	   $$ = VERT_ATTRIB_TEX0 + $2;
+	}
+	| MATRIXINDEX '[' vtxWeightNum ']'
+	{
+	   yyerror(& @1, state, "GL_ARB_matrix_palette not supported");
+	   YYERROR;
+	}
+	| VTXATTRIB '[' vtxAttribNum ']'
+	{
+	   $$ = VERT_ATTRIB_GENERIC0 + $3;
+	}
+	;
+
+vtxAttribNum: INTEGER
+	{
+	   if ((unsigned) $1 >= state->limits->MaxAttribs) {
+	      yyerror(& @1, state, "invalid vertex attribute reference");
+	      YYERROR;
+	   }
+
+	   $$ = $1;
+	}
+	;
+
+vtxOptWeightNum:  | '[' vtxWeightNum ']';
+vtxWeightNum: INTEGER;
+
+fragAttribItem: POSITION
+	{
+	   $$ = FRAG_ATTRIB_WPOS;
+	}
+	| COLOR optColorType
+	{
+	   $$ = FRAG_ATTRIB_COL0 + $2;
+	}
+	| FOGCOORD
+	{
+	   $$ = FRAG_ATTRIB_FOGC;
+	}
+	| TEXCOORD optTexCoordUnitNum
+	{
+	   $$ = FRAG_ATTRIB_TEX0 + $2;
+	}
+	;
+
+PARAM_statement: PARAM_singleStmt | PARAM_multipleStmt;
+
+PARAM_singleStmt: PARAM IDENTIFIER paramSingleInit
+	{
+	   struct asm_symbol *const s =
+	      declare_variable(state, $2, at_param, & @2);
+
+	   if (s == NULL) {
+	      free($2);
+	      YYERROR;
+	   } else {
+	      s->param_binding_type = $3.param_binding_type;
+	      s->param_binding_begin = $3.param_binding_begin;
+	      s->param_binding_length = $3.param_binding_length;
+              s->param_binding_swizzle = $3.param_binding_swizzle;
+	      s->param_is_array = 0;
+	   }
+	}
+	;
+
+PARAM_multipleStmt: PARAM IDENTIFIER '[' optArraySize ']' paramMultipleInit
+	{
+	   if (($4 != 0) && ((unsigned) $4 != $6.param_binding_length)) {
+	      free($2);
+	      yyerror(& @4, state, 
+		      "parameter array size and number of bindings must match");
+	      YYERROR;
+	   } else {
+	      struct asm_symbol *const s =
+		 declare_variable(state, $2, $6.type, & @2);
+
+	      if (s == NULL) {
+		 free($2);
+		 YYERROR;
+	      } else {
+		 s->param_binding_type = $6.param_binding_type;
+		 s->param_binding_begin = $6.param_binding_begin;
+		 s->param_binding_length = $6.param_binding_length;
+                 s->param_binding_swizzle = SWIZZLE_XYZW;
+		 s->param_is_array = 1;
+	      }
+	   }
+	}
+	;
+
+optArraySize:
+	{
+	   $$ = 0;
+	}
+	| INTEGER
+        {
+	   if (($1 < 1) || ((unsigned) $1 > state->limits->MaxParameters)) {
+	      yyerror(& @1, state, "invalid parameter array size");
+	      YYERROR;
+	   } else {
+	      $$ = $1;
+	   }
+	}
+	;
+
+paramSingleInit: '=' paramSingleItemDecl
+	{
+	   $$ = $2;
+	}
+	;
+
+paramMultipleInit: '=' '{' paramMultInitList '}'
+	{
+	   $$ = $3;
+	}
+	;
+
+paramMultInitList: paramMultipleItem
+	| paramMultInitList ',' paramMultipleItem
+	{
+	   $1.param_binding_length += $3.param_binding_length;
+	   $$ = $1;
+	}
+	;
+
+paramSingleItemDecl: stateSingleItem
+	{
+	   memset(& $$, 0, sizeof($$));
+	   $$.param_binding_begin = ~0;
+	   initialize_symbol_from_state(state->prog, & $$, $1);
+	}
+	| programSingleItem
+	{
+	   memset(& $$, 0, sizeof($$));
+	   $$.param_binding_begin = ~0;
+	   initialize_symbol_from_param(state->prog, & $$, $1);
+	}
+	| paramConstDecl
+	{
+	   memset(& $$, 0, sizeof($$));
+	   $$.param_binding_begin = ~0;
+	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_TRUE);
+	}
+	;
+
+paramSingleItemUse: stateSingleItem
+	{
+	   memset(& $$, 0, sizeof($$));
+	   $$.param_binding_begin = ~0;
+	   initialize_symbol_from_state(state->prog, & $$, $1);
+	}
+	| programSingleItem
+	{
+	   memset(& $$, 0, sizeof($$));
+	   $$.param_binding_begin = ~0;
+	   initialize_symbol_from_param(state->prog, & $$, $1);
+	}
+	| paramConstUse
+	{
+	   memset(& $$, 0, sizeof($$));
+	   $$.param_binding_begin = ~0;
+	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_TRUE);
+	}
+	;
+
+paramMultipleItem: stateMultipleItem
+	{
+	   memset(& $$, 0, sizeof($$));
+	   $$.param_binding_begin = ~0;
+	   initialize_symbol_from_state(state->prog, & $$, $1);
+	}
+	| programMultipleItem
+	{
+	   memset(& $$, 0, sizeof($$));
+	   $$.param_binding_begin = ~0;
+	   initialize_symbol_from_param(state->prog, & $$, $1);
+	}
+	| paramConstDecl
+	{
+	   memset(& $$, 0, sizeof($$));
+	   $$.param_binding_begin = ~0;
+	   initialize_symbol_from_const(state->prog, & $$, & $1, GL_FALSE);
+	}
+	;
+
+stateMultipleItem: stateSingleItem        { memcpy($$, $1, sizeof($$)); }
+	| STATE stateMatrixRows           { memcpy($$, $2, sizeof($$)); }
+	;
+
+stateSingleItem: STATE stateMaterialItem  { memcpy($$, $2, sizeof($$)); }
+	| STATE stateLightItem            { memcpy($$, $2, sizeof($$)); }
+	| STATE stateLightModelItem       { memcpy($$, $2, sizeof($$)); }
+	| STATE stateLightProdItem        { memcpy($$, $2, sizeof($$)); }
+	| STATE stateTexGenItem           { memcpy($$, $2, sizeof($$)); }
+	| STATE stateTexEnvItem           { memcpy($$, $2, sizeof($$)); }
+	| STATE stateFogItem              { memcpy($$, $2, sizeof($$)); }
+	| STATE stateClipPlaneItem        { memcpy($$, $2, sizeof($$)); }
+	| STATE statePointItem            { memcpy($$, $2, sizeof($$)); }
+	| STATE stateMatrixRow            { memcpy($$, $2, sizeof($$)); }
+	| STATE stateDepthItem            { memcpy($$, $2, sizeof($$)); }
+	;
+
+stateMaterialItem: MATERIAL optFaceType stateMatProperty
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = STATE_MATERIAL;
+	   $$[1] = $2;
+	   $$[2] = $3;
+	}
+	;
+
+stateMatProperty: ambDiffSpecProperty
+	{
+	   $$ = $1;
+	}
+	| EMISSION
+	{
+	   $$ = STATE_EMISSION;
+	}
+	| SHININESS
+	{
+	   $$ = STATE_SHININESS;
+	}
+	;
+
+stateLightItem: LIGHT '[' stateLightNumber ']' stateLightProperty
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = STATE_LIGHT;
+	   $$[1] = $3;
+	   $$[2] = $5;
+	}
+	;
+
+stateLightProperty: ambDiffSpecProperty
+	{
+	   $$ = $1;
+	}
+	| POSITION
+	{
+	   $$ = STATE_POSITION;
+	}
+	| ATTENUATION
+	{
+	   if (!state->ctx->Extensions.EXT_point_parameters) {
+	      yyerror(& @1, state, "GL_ARB_point_parameters not supported");
+	      YYERROR;
+	   }
+
+	   $$ = STATE_ATTENUATION;
+	}
+	| SPOT stateSpotProperty
+	{
+	   $$ = $2;
+	}
+	| HALF
+	{
+	   $$ = STATE_HALF_VECTOR;
+	}
+	;
+
+stateSpotProperty: DIRECTION
+	{
+	   $$ = STATE_SPOT_DIRECTION;
+	}
+	;
+
+stateLightModelItem: LIGHTMODEL stateLModProperty
+	{
+	   $$[0] = $2[0];
+	   $$[1] = $2[1];
+	}
+	;
+
+stateLModProperty: AMBIENT
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = STATE_LIGHTMODEL_AMBIENT;
+	}
+	| optFaceType SCENECOLOR
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = STATE_LIGHTMODEL_SCENECOLOR;
+	   $$[1] = $1;
+	}
+	;
+
+stateLightProdItem: LIGHTPROD '[' stateLightNumber ']' optFaceType stateLProdProperty
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = STATE_LIGHTPROD;
+	   $$[1] = $3;
+	   $$[2] = $5;
+	   $$[3] = $6;
+	}
+	;
+
+stateLProdProperty: ambDiffSpecProperty;
+
+stateTexEnvItem: TEXENV optLegacyTexUnitNum stateTexEnvProperty
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = $3;
+	   $$[1] = $2;
+	}
+	;
+
+stateTexEnvProperty: COLOR
+	{
+	   $$ = STATE_TEXENV_COLOR;
+	}
+	;
+
+ambDiffSpecProperty: AMBIENT
+	{
+	   $$ = STATE_AMBIENT;
+	}
+	| DIFFUSE
+	{
+	   $$ = STATE_DIFFUSE;
+	}
+	| SPECULAR
+	{
+	   $$ = STATE_SPECULAR;
+	}
+	;
+
+stateLightNumber: INTEGER
+	{
+	   if ((unsigned) $1 >= state->MaxLights) {
+	      yyerror(& @1, state, "invalid light selector");
+	      YYERROR;
+	   }
+
+	   $$ = $1;
+	}
+	;
+
+stateTexGenItem: TEXGEN optTexCoordUnitNum stateTexGenType stateTexGenCoord
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = STATE_TEXGEN;
+	   $$[1] = $2;
+	   $$[2] = $3 + $4;
+	}
+	;
+
+stateTexGenType: EYE
+	{
+	   $$ = STATE_TEXGEN_EYE_S;
+	}
+	| OBJECT
+	{
+	   $$ = STATE_TEXGEN_OBJECT_S;
+	}
+	;
+stateTexGenCoord: TEXGEN_S
+	{
+	   $$ = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;
+	}
+	| TEXGEN_T
+	{
+	   $$ = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;
+	}
+	| TEXGEN_R
+	{
+	   $$ = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;
+	}
+	| TEXGEN_Q
+	{
+	   $$ = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;
+	}
+	;
+
+stateFogItem: FOG stateFogProperty
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = $2;
+	}
+	;
+
+stateFogProperty: COLOR
+	{
+	   $$ = STATE_FOG_COLOR;
+	}
+	| PARAMS
+	{
+	   $$ = STATE_FOG_PARAMS;
+	}
+	;
+
+stateClipPlaneItem: CLIP '[' stateClipPlaneNum ']' PLANE
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = STATE_CLIPPLANE;
+	   $$[1] = $3;
+	}
+	;
+
+stateClipPlaneNum: INTEGER
+	{
+	   if ((unsigned) $1 >= state->MaxClipPlanes) {
+	      yyerror(& @1, state, "invalid clip plane selector");
+	      YYERROR;
+	   }
+
+	   $$ = $1;
+	}
+	;
+
+statePointItem: POINT_TOK statePointProperty
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = $2;
+	}
+	;
+
+statePointProperty: SIZE_TOK
+	{
+	   $$ = STATE_POINT_SIZE;
+	}
+	| ATTENUATION
+	{
+	   $$ = STATE_POINT_ATTENUATION;
+	}
+	;
+
+stateMatrixRow: stateMatrixItem ROW '[' stateMatrixRowNum ']'
+	{
+	   $$[0] = $1[0];
+	   $$[1] = $1[1];
+	   $$[2] = $4;
+	   $$[3] = $4;
+	   $$[4] = $1[2];
+	}
+	;
+
+stateMatrixRows: stateMatrixItem optMatrixRows
+	{
+	   $$[0] = $1[0];
+	   $$[1] = $1[1];
+	   $$[2] = $2[2];
+	   $$[3] = $2[3];
+	   $$[4] = $1[2];
+	}
+	;
+
+optMatrixRows:
+	{
+	   $$[2] = 0;
+	   $$[3] = 3;
+	}
+	| ROW '[' stateMatrixRowNum DOT_DOT stateMatrixRowNum ']'
+	{
+	   /* It seems logical that the matrix row range specifier would have
+	    * to specify a range or more than one row (i.e., $5 > $3).
+	    * However, the ARB_vertex_program spec says "a program will fail
+	    * to load if <a> is greater than <b>."  This means that $3 == $5
+	    * is valid.
+	    */
+	   if ($3 > $5) {
+	      yyerror(& @3, state, "invalid matrix row range");
+	      YYERROR;
+	   }
+
+	   $$[2] = $3;
+	   $$[3] = $5;
+	}
+	;
+
+stateMatrixItem: MATRIX stateMatrixName stateOptMatModifier
+	{
+	   $$[0] = $2[0];
+	   $$[1] = $2[1];
+	   $$[2] = $3;
+	}
+	;
+
+stateOptMatModifier: 
+	{
+	   $$ = 0;
+	}
+	| stateMatModifier
+	{
+	   $$ = $1;
+	}
+	;
+
+stateMatModifier: INVERSE 
+	{
+	   $$ = STATE_MATRIX_INVERSE;
+	}
+	| TRANSPOSE 
+	{
+	   $$ = STATE_MATRIX_TRANSPOSE;
+	}
+	| INVTRANS
+	{
+	   $$ = STATE_MATRIX_INVTRANS;
+	}
+	;
+
+stateMatrixRowNum: INTEGER
+	{
+	   if ($1 > 3) {
+	      yyerror(& @1, state, "invalid matrix row reference");
+	      YYERROR;
+	   }
+
+	   $$ = $1;
+	}
+	;
+
+stateMatrixName: MODELVIEW stateOptModMatNum
+	{
+	   $$[0] = STATE_MODELVIEW_MATRIX;
+	   $$[1] = $2;
+	}
+	| PROJECTION
+	{
+	   $$[0] = STATE_PROJECTION_MATRIX;
+	   $$[1] = 0;
+	}
+	| MVP
+	{
+	   $$[0] = STATE_MVP_MATRIX;
+	   $$[1] = 0;
+	}
+	| TEXTURE optTexCoordUnitNum
+	{
+	   $$[0] = STATE_TEXTURE_MATRIX;
+	   $$[1] = $2;
+	}
+	| PALETTE '[' statePaletteMatNum ']'
+	{
+	   yyerror(& @1, state, "GL_ARB_matrix_palette not supported");
+	   YYERROR;
+	}
+	| MAT_PROGRAM '[' stateProgramMatNum ']'
+	{
+	   $$[0] = STATE_PROGRAM_MATRIX;
+	   $$[1] = $3;
+	}
+	;
+
+stateOptModMatNum:
+	{
+	   $$ = 0;
+	}
+	| '[' stateModMatNum ']'
+	{
+	   $$ = $2;
+	}
+	;
+stateModMatNum: INTEGER
+	{
+	   /* Since GL_ARB_vertex_blend isn't supported, only modelview matrix
+	    * zero is valid.
+	    */
+	   if ($1 != 0) {
+	      yyerror(& @1, state, "invalid modelview matrix index");
+	      YYERROR;
+	   }
+
+	   $$ = $1;
+	}
+	;
+statePaletteMatNum: INTEGER
+	{
+	   /* Since GL_ARB_matrix_palette isn't supported, just let any value
+	    * through here.  The error will be generated later.
+	    */
+	   $$ = $1;
+	}
+	;
+stateProgramMatNum: INTEGER
+	{
+	   if ((unsigned) $1 >= state->MaxProgramMatrices) {
+	      yyerror(& @1, state, "invalid program matrix selector");
+	      YYERROR;
+	   }
+
+	   $$ = $1;
+	}
+	;
+
+stateDepthItem: DEPTH RANGE
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = STATE_DEPTH_RANGE;
+	}
+	;
+
+
+programSingleItem: progEnvParam | progLocalParam;
+
+programMultipleItem: progEnvParams | progLocalParams;
+
+progEnvParams: PROGRAM ENV '[' progEnvParamNums ']'
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = state->state_param_enum;
+	   $$[1] = STATE_ENV;
+	   $$[2] = $4[0];
+	   $$[3] = $4[1];
+	}
+	;
+
+progEnvParamNums: progEnvParamNum
+	{
+	   $$[0] = $1;
+	   $$[1] = $1;
+	}
+	| progEnvParamNum DOT_DOT progEnvParamNum
+	{
+	   $$[0] = $1;
+	   $$[1] = $3;
+	}
+	;
+
+progEnvParam: PROGRAM ENV '[' progEnvParamNum ']'
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = state->state_param_enum;
+	   $$[1] = STATE_ENV;
+	   $$[2] = $4;
+	   $$[3] = $4;
+	}
+	;
+
+progLocalParams: PROGRAM LOCAL '[' progLocalParamNums ']'
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = state->state_param_enum;
+	   $$[1] = STATE_LOCAL;
+	   $$[2] = $4[0];
+	   $$[3] = $4[1];
+	}
+
+progLocalParamNums: progLocalParamNum
+	{
+	   $$[0] = $1;
+	   $$[1] = $1;
+	}
+	| progLocalParamNum DOT_DOT progLocalParamNum
+	{
+	   $$[0] = $1;
+	   $$[1] = $3;
+	}
+	;
+
+progLocalParam: PROGRAM LOCAL '[' progLocalParamNum ']'
+	{
+	   memset($$, 0, sizeof($$));
+	   $$[0] = state->state_param_enum;
+	   $$[1] = STATE_LOCAL;
+	   $$[2] = $4;
+	   $$[3] = $4;
+	}
+	;
+
+progEnvParamNum: INTEGER
+	{
+	   if ((unsigned) $1 >= state->limits->MaxEnvParams) {
+	      yyerror(& @1, state, "invalid environment parameter reference");
+	      YYERROR;
+	   }
+	   $$ = $1;
+	}
+	;
+
+progLocalParamNum: INTEGER
+	{
+	   if ((unsigned) $1 >= state->limits->MaxLocalParams) {
+	      yyerror(& @1, state, "invalid local parameter reference");
+	      YYERROR;
+	   }
+	   $$ = $1;
+	}
+	;
+
+
+
+paramConstDecl: paramConstScalarDecl | paramConstVector;
+paramConstUse: paramConstScalarUse | paramConstVector;
+
+paramConstScalarDecl: signedFloatConstant
+	{
+	   $$.count = 4;
+	   $$.data[0] = $1;
+	   $$.data[1] = $1;
+	   $$.data[2] = $1;
+	   $$.data[3] = $1;
+	}
+	;
+
+paramConstScalarUse: REAL
+	{
+	   $$.count = 1;
+	   $$.data[0] = $1;
+	   $$.data[1] = $1;
+	   $$.data[2] = $1;
+	   $$.data[3] = $1;
+	}
+	| INTEGER
+	{
+	   $$.count = 1;
+	   $$.data[0] = (float) $1;
+	   $$.data[1] = (float) $1;
+	   $$.data[2] = (float) $1;
+	   $$.data[3] = (float) $1;
+	}
+	;
+
+paramConstVector: '{' signedFloatConstant '}'
+	{
+	   $$.count = 4;
+	   $$.data[0] = $2;
+	   $$.data[1] = 0.0f;
+	   $$.data[2] = 0.0f;
+	   $$.data[3] = 1.0f;
+	}
+	| '{' signedFloatConstant ',' signedFloatConstant '}'
+	{
+	   $$.count = 4;
+	   $$.data[0] = $2;
+	   $$.data[1] = $4;
+	   $$.data[2] = 0.0f;
+	   $$.data[3] = 1.0f;
+	}
+	| '{' signedFloatConstant ',' signedFloatConstant ','
+              signedFloatConstant '}'
+	{
+	   $$.count = 4;
+	   $$.data[0] = $2;
+	   $$.data[1] = $4;
+	   $$.data[2] = $6;
+	   $$.data[3] = 1.0f;
+	}
+	| '{' signedFloatConstant ',' signedFloatConstant ','
+              signedFloatConstant ',' signedFloatConstant '}'
+	{
+	   $$.count = 4;
+	   $$.data[0] = $2;
+	   $$.data[1] = $4;
+	   $$.data[2] = $6;
+	   $$.data[3] = $8;
+	}
+	;
+
+signedFloatConstant: optionalSign REAL
+	{
+	   $$ = ($1) ? -$2 : $2;
+	}
+	| optionalSign INTEGER
+	{
+	   $$ = (float)(($1) ? -$2 : $2);
+	}
+	;
+
+optionalSign: '+'        { $$ = FALSE; }
+	| '-'            { $$ = TRUE;  }
+	|                { $$ = FALSE; }
+	;
+
+TEMP_statement: optVarSize TEMP { $<integer>$ = $2; } varNameList
+	;
+
+optVarSize: string
+	{
+	   /* NV_fragment_program_option defines the size qualifiers in a
+	    * fairly broken way.  "SHORT" or "LONG" can optionally be used
+	    * before TEMP or OUTPUT.  However, neither is a reserved word!
+	    * This means that we have to parse it as an identifier, then check
+	    * to make sure it's one of the valid values.  *sigh*
+	    *
+	    * In addition, the grammar in the extension spec does *not* allow
+	    * the size specifier to be optional, but all known implementations
+	    * do.
+	    */
+	   if (!state->option.NV_fragment) {
+	      yyerror(& @1, state, "unexpected IDENTIFIER");
+	      YYERROR;
+	   }
+
+	   if (strcmp("SHORT", $1) == 0) {
+	   } else if (strcmp("LONG", $1) == 0) {
+	   } else {
+	      char *const err_str =
+		 make_error_string("invalid storage size specifier \"%s\"",
+				   $1);
+
+	      yyerror(& @1, state, (err_str != NULL)
+		      ? err_str : "invalid storage size specifier");
+
+	      if (err_str != NULL) {
+		 free(err_str);
+	      }
+
+	      YYERROR;
+	   }
+	}
+	|
+	{
+	}
+	;
+
+ADDRESS_statement: ADDRESS { $<integer>$ = $1; } varNameList
+	;
+
+varNameList: varNameList ',' IDENTIFIER
+	{
+	   if (!declare_variable(state, $3, $<integer>0, & @3)) {
+	      free($3);
+	      YYERROR;
+	   }
+	}
+	| IDENTIFIER
+	{
+	   if (!declare_variable(state, $1, $<integer>0, & @1)) {
+	      free($1);
+	      YYERROR;
+	   }
+	}
+	;
+
+OUTPUT_statement: optVarSize OUTPUT IDENTIFIER '=' resultBinding
+	{
+	   struct asm_symbol *const s =
+	      declare_variable(state, $3, at_output, & @3);
+
+	   if (s == NULL) {
+	      free($3);
+	      YYERROR;
+	   } else {
+	      s->output_binding = $5;
+	   }
+	}
+	;
+
+resultBinding: RESULT POSITION
+	{
+	   if (state->mode == ARB_vertex) {
+	      $$ = VERT_RESULT_HPOS;
+	   } else {
+	      yyerror(& @2, state, "invalid program result name");
+	      YYERROR;
+	   }
+	}
+	| RESULT FOGCOORD
+	{
+	   if (state->mode == ARB_vertex) {
+	      $$ = VERT_RESULT_FOGC;
+	   } else {
+	      yyerror(& @2, state, "invalid program result name");
+	      YYERROR;
+	   }
+	}
+	| RESULT resultColBinding
+	{
+	   $$ = $2;
+	}
+	| RESULT POINTSIZE
+	{
+	   if (state->mode == ARB_vertex) {
+	      $$ = VERT_RESULT_PSIZ;
+	   } else {
+	      yyerror(& @2, state, "invalid program result name");
+	      YYERROR;
+	   }
+	}
+	| RESULT TEXCOORD optTexCoordUnitNum
+	{
+	   if (state->mode == ARB_vertex) {
+	      $$ = VERT_RESULT_TEX0 + $3;
+	   } else {
+	      yyerror(& @2, state, "invalid program result name");
+	      YYERROR;
+	   }
+	}
+	| RESULT DEPTH
+	{
+	   if (state->mode == ARB_fragment) {
+	      $$ = FRAG_RESULT_DEPTH;
+	   } else {
+	      yyerror(& @2, state, "invalid program result name");
+	      YYERROR;
+	   }
+	}
+	;
+
+resultColBinding: COLOR optResultFaceType optResultColorType
+	{
+	   $$ = $2 + $3;
+	}
+	;
+
+optResultFaceType:
+	{
+	   $$ = (state->mode == ARB_vertex)
+	      ? VERT_RESULT_COL0
+	      : FRAG_RESULT_COLOR;
+	}
+	| FRONT
+	{
+	   if (state->mode == ARB_vertex) {
+	      $$ = VERT_RESULT_COL0;
+	   } else {
+	      yyerror(& @1, state, "invalid program result name");
+	      YYERROR;
+	   }
+	}
+	| BACK
+	{
+	   if (state->mode == ARB_vertex) {
+	      $$ = VERT_RESULT_BFC0;
+	   } else {
+	      yyerror(& @1, state, "invalid program result name");
+	      YYERROR;
+	   }
+	}
+	;
+
+optResultColorType:
+	{
+	   $$ = 0; 
+	}
+	| PRIMARY
+	{
+	   if (state->mode == ARB_vertex) {
+	      $$ = 0;
+	   } else {
+	      yyerror(& @1, state, "invalid program result name");
+	      YYERROR;
+	   }
+	}
+	| SECONDARY
+	{
+	   if (state->mode == ARB_vertex) {
+	      $$ = 1;
+	   } else {
+	      yyerror(& @1, state, "invalid program result name");
+	      YYERROR;
+	   }
+	}
+	;
+
+optFaceType:    { $$ = 0; }
+	| FRONT	{ $$ = 0; }
+	| BACK  { $$ = 1; }
+	;
+
+optColorType:       { $$ = 0; }
+	| PRIMARY   { $$ = 0; }
+	| SECONDARY { $$ = 1; }
+	;
+
+optTexCoordUnitNum:                { $$ = 0; }
+	| '[' texCoordUnitNum ']'  { $$ = $2; }
+	;
+
+optTexImageUnitNum:                { $$ = 0; }
+	| '[' texImageUnitNum ']'  { $$ = $2; }
+	;
+
+optLegacyTexUnitNum:               { $$ = 0; }
+	| '[' legacyTexUnitNum ']' { $$ = $2; }
+	;
+
+texCoordUnitNum: INTEGER
+	{
+	   if ((unsigned) $1 >= state->MaxTextureCoordUnits) {
+	      yyerror(& @1, state, "invalid texture coordinate unit selector");
+	      YYERROR;
+	   }
+
+	   $$ = $1;
+	}
+	;
+
+texImageUnitNum: INTEGER
+	{
+	   if ((unsigned) $1 >= state->MaxTextureImageUnits) {
+	      yyerror(& @1, state, "invalid texture image unit selector");
+	      YYERROR;
+	   }
+
+	   $$ = $1;
+	}
+	;
+
+legacyTexUnitNum: INTEGER
+	{
+	   if ((unsigned) $1 >= state->MaxTextureUnits) {
+	      yyerror(& @1, state, "invalid texture unit selector");
+	      YYERROR;
+	   }
+
+	   $$ = $1;
+	}
+	;
+
+ALIAS_statement: ALIAS IDENTIFIER '=' USED_IDENTIFIER
+	{
+	   struct asm_symbol *exist = (struct asm_symbol *)
+	      _mesa_symbol_table_find_symbol(state->st, 0, $2);
+	   struct asm_symbol *target = (struct asm_symbol *)
+	      _mesa_symbol_table_find_symbol(state->st, 0, $4);
+
+	   free($4);
+
+	   if (exist != NULL) {
+	      char m[1000];
+	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", $2);
+	      free($2);
+	      yyerror(& @2, state, m);
+	      YYERROR;
+	   } else if (target == NULL) {
+	      free($2);
+	      yyerror(& @4, state,
+		      "undefined variable binding in ALIAS statement");
+	      YYERROR;
+	   } else {
+	      _mesa_symbol_table_add_symbol(state->st, 0, $2, target);
+	   }
+	}
+	;
+
+string: IDENTIFIER
+	| USED_IDENTIFIER
+	;
+
+%%
+
+void
+asm_instruction_set_operands(struct asm_instruction *inst,
+			     const struct prog_dst_register *dst,
+			     const struct asm_src_register *src0,
+			     const struct asm_src_register *src1,
+			     const struct asm_src_register *src2)
+{
+   /* In the core ARB extensions only the KIL instruction doesn't have a
+    * destination register.
+    */
+   if (dst == NULL) {
+      init_dst_reg(& inst->Base.DstReg);
+   } else {
+      inst->Base.DstReg = *dst;
+   }
+
+   /* The only instruction that doesn't have any source registers is the
+    * condition-code based KIL instruction added by NV_fragment_program_option.
+    */
+   if (src0 != NULL) {
+      inst->Base.SrcReg[0] = src0->Base;
+      inst->SrcReg[0] = *src0;
+   } else {
+      init_src_reg(& inst->SrcReg[0]);
+   }
+
+   if (src1 != NULL) {
+      inst->Base.SrcReg[1] = src1->Base;
+      inst->SrcReg[1] = *src1;
+   } else {
+      init_src_reg(& inst->SrcReg[1]);
+   }
+
+   if (src2 != NULL) {
+      inst->Base.SrcReg[2] = src2->Base;
+      inst->SrcReg[2] = *src2;
+   } else {
+      init_src_reg(& inst->SrcReg[2]);
+   }
+}
+
+
+struct asm_instruction *
+asm_instruction_ctor(gl_inst_opcode op,
+		     const struct prog_dst_register *dst,
+		     const struct asm_src_register *src0,
+		     const struct asm_src_register *src1,
+		     const struct asm_src_register *src2)
+{
+   struct asm_instruction *inst = CALLOC_STRUCT(asm_instruction);
+
+   if (inst) {
+      _mesa_init_instructions(& inst->Base, 1);
+      inst->Base.Opcode = op;
+
+      asm_instruction_set_operands(inst, dst, src0, src1, src2);
+   }
+
+   return inst;
+}
+
+
+struct asm_instruction *
+asm_instruction_copy_ctor(const struct prog_instruction *base,
+			  const struct prog_dst_register *dst,
+			  const struct asm_src_register *src0,
+			  const struct asm_src_register *src1,
+			  const struct asm_src_register *src2)
+{
+   struct asm_instruction *inst = CALLOC_STRUCT(asm_instruction);
+
+   if (inst) {
+      _mesa_init_instructions(& inst->Base, 1);
+      inst->Base.Opcode = base->Opcode;
+      inst->Base.CondUpdate = base->CondUpdate;
+      inst->Base.CondDst = base->CondDst;
+      inst->Base.SaturateMode = base->SaturateMode;
+      inst->Base.Precision = base->Precision;
+
+      asm_instruction_set_operands(inst, dst, src0, src1, src2);
+   }
+
+   return inst;
+}
+
+
+void
+init_dst_reg(struct prog_dst_register *r)
+{
+   memset(r, 0, sizeof(*r));
+   r->File = PROGRAM_UNDEFINED;
+   r->WriteMask = WRITEMASK_XYZW;
+   r->CondMask = COND_TR;
+   r->CondSwizzle = SWIZZLE_NOOP;
+}
+
+
+/** Like init_dst_reg() but set the File and Index fields. */
+void
+set_dst_reg(struct prog_dst_register *r, gl_register_file file, GLint index)
+{
+   const GLint maxIndex = 1 << INST_INDEX_BITS;
+   const GLint minIndex = 0;
+   ASSERT(index >= minIndex);
+   (void) minIndex;
+   ASSERT(index <= maxIndex);
+   (void) maxIndex;
+   ASSERT(file == PROGRAM_TEMPORARY ||
+	  file == PROGRAM_ADDRESS ||
+	  file == PROGRAM_OUTPUT);
+   memset(r, 0, sizeof(*r));
+   r->File = file;
+   r->Index = index;
+   r->WriteMask = WRITEMASK_XYZW;
+   r->CondMask = COND_TR;
+   r->CondSwizzle = SWIZZLE_NOOP;
+}
+
+
+void
+init_src_reg(struct asm_src_register *r)
+{
+   memset(r, 0, sizeof(*r));
+   r->Base.File = PROGRAM_UNDEFINED;
+   r->Base.Swizzle = SWIZZLE_NOOP;
+   r->Symbol = NULL;
+}
+
+
+/** Like init_src_reg() but set the File and Index fields.
+ * \return GL_TRUE if a valid src register, GL_FALSE otherwise
+ */
+void
+set_src_reg(struct asm_src_register *r, gl_register_file file, GLint index)
+{
+   set_src_reg_swz(r, file, index, SWIZZLE_XYZW);
+}
+
+
+void
+set_src_reg_swz(struct asm_src_register *r, gl_register_file file, GLint index,
+                GLuint swizzle)
+{
+   const GLint maxIndex = (1 << INST_INDEX_BITS) - 1;
+   const GLint minIndex = -(1 << INST_INDEX_BITS);
+   ASSERT(file < PROGRAM_FILE_MAX);
+   ASSERT(index >= minIndex);
+   (void) minIndex;
+   ASSERT(index <= maxIndex);
+   (void) maxIndex;
+   memset(r, 0, sizeof(*r));
+   r->Base.File = file;
+   r->Base.Index = index;
+   r->Base.Swizzle = swizzle;
+   r->Symbol = NULL;
+}
+
+
+/**
+ * Validate the set of inputs used by a program
+ *
+ * Validates that legal sets of inputs are used by the program.  In this case
+ * "used" included both reading the input or binding the input to a name using
+ * the \c ATTRIB command.
+ *
+ * \return
+ * \c TRUE if the combination of inputs used is valid, \c FALSE otherwise.
+ */
+int
+validate_inputs(struct YYLTYPE *locp, struct asm_parser_state *state)
+{
+   const int inputs = state->prog->InputsRead | state->InputsBound;
+
+   if (((inputs & 0x0ffff) & (inputs >> 16)) != 0) {
+      yyerror(locp, state, "illegal use of generic attribute and name attribute");
+      return 0;
+   }
+
+   return 1;
+}
+
+
+struct asm_symbol *
+declare_variable(struct asm_parser_state *state, char *name, enum asm_type t,
+		 struct YYLTYPE *locp)
+{
+   struct asm_symbol *s = NULL;
+   struct asm_symbol *exist = (struct asm_symbol *)
+      _mesa_symbol_table_find_symbol(state->st, 0, name);
+
+
+   if (exist != NULL) {
+      yyerror(locp, state, "redeclared identifier");
+   } else {
+      s = calloc(1, sizeof(struct asm_symbol));
+      s->name = name;
+      s->type = t;
+
+      switch (t) {
+      case at_temp:
+	 if (state->prog->NumTemporaries >= state->limits->MaxTemps) {
+	    yyerror(locp, state, "too many temporaries declared");
+	    free(s);
+	    return NULL;
+	 }
+
+	 s->temp_binding = state->prog->NumTemporaries;
+	 state->prog->NumTemporaries++;
+	 break;
+
+      case at_address:
+	 if (state->prog->NumAddressRegs >= state->limits->MaxAddressRegs) {
+	    yyerror(locp, state, "too many address registers declared");
+	    free(s);
+	    return NULL;
+	 }
+
+	 /* FINISHME: Add support for multiple address registers.
+	  */
+	 state->prog->NumAddressRegs++;
+	 break;
+
+      default:
+	 break;
+      }
+
+      _mesa_symbol_table_add_symbol(state->st, 0, s->name, s);
+      s->next = state->sym;
+      state->sym = s;
+   }
+
+   return s;
+}
+
+
+int add_state_reference(struct gl_program_parameter_list *param_list,
+			const gl_state_index tokens[STATE_LENGTH])
+{
+   const GLuint size = 4; /* XXX fix */
+   char *name;
+   GLint index;
+
+   name = _mesa_program_state_string(tokens);
+   index = _mesa_add_parameter(param_list, PROGRAM_STATE_VAR, name,
+                               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() */
+   free(name);
+
+   return index;
+}
+
+
+int
+initialize_symbol_from_state(struct gl_program *prog,
+			     struct asm_symbol *param_var, 
+			     const gl_state_index tokens[STATE_LENGTH])
+{
+   int idx = -1;
+   gl_state_index state_tokens[STATE_LENGTH];
+
+
+   memcpy(state_tokens, tokens, sizeof(state_tokens));
+
+   param_var->type = at_param;
+   param_var->param_binding_type = PROGRAM_STATE_VAR;
+
+   /* If we are adding a STATE_MATRIX that has multiple rows, we need to
+    * unroll it and call add_state_reference() for each row
+    */
+   if ((state_tokens[0] == STATE_MODELVIEW_MATRIX ||
+	state_tokens[0] == STATE_PROJECTION_MATRIX ||
+	state_tokens[0] == STATE_MVP_MATRIX ||
+	state_tokens[0] == STATE_TEXTURE_MATRIX ||
+	state_tokens[0] == STATE_PROGRAM_MATRIX)
+       && (state_tokens[2] != state_tokens[3])) {
+      int row;
+      const int first_row = state_tokens[2];
+      const int last_row = state_tokens[3];
+
+      for (row = first_row; row <= last_row; row++) {
+	 state_tokens[2] = state_tokens[3] = row;
+
+	 idx = add_state_reference(prog->Parameters, state_tokens);
+	 if (param_var->param_binding_begin == ~0U) {
+	    param_var->param_binding_begin = idx;
+            param_var->param_binding_swizzle = SWIZZLE_XYZW;
+         }
+
+	 param_var->param_binding_length++;
+      }
+   }
+   else {
+      idx = add_state_reference(prog->Parameters, state_tokens);
+      if (param_var->param_binding_begin == ~0U) {
+	 param_var->param_binding_begin = idx;
+         param_var->param_binding_swizzle = SWIZZLE_XYZW;
+      }
+      param_var->param_binding_length++;
+   }
+
+   return idx;
+}
+
+
+int
+initialize_symbol_from_param(struct gl_program *prog,
+			     struct asm_symbol *param_var, 
+			     const gl_state_index tokens[STATE_LENGTH])
+{
+   int idx = -1;
+   gl_state_index state_tokens[STATE_LENGTH];
+
+
+   memcpy(state_tokens, tokens, sizeof(state_tokens));
+
+   assert((state_tokens[0] == STATE_VERTEX_PROGRAM)
+	  || (state_tokens[0] == STATE_FRAGMENT_PROGRAM));
+   assert((state_tokens[1] == STATE_ENV)
+	  || (state_tokens[1] == STATE_LOCAL));
+
+   /*
+    * The param type is STATE_VAR.  The program parameter entry will
+    * effectively be a pointer into the LOCAL or ENV parameter array.
+    */
+   param_var->type = at_param;
+   param_var->param_binding_type = PROGRAM_STATE_VAR;
+
+   /* If we are adding a STATE_ENV or STATE_LOCAL that has multiple elements,
+    * we need to unroll it and call add_state_reference() for each row
+    */
+   if (state_tokens[2] != state_tokens[3]) {
+      int row;
+      const int first_row = state_tokens[2];
+      const int last_row = state_tokens[3];
+
+      for (row = first_row; row <= last_row; row++) {
+	 state_tokens[2] = state_tokens[3] = row;
+
+	 idx = add_state_reference(prog->Parameters, state_tokens);
+	 if (param_var->param_binding_begin == ~0U) {
+	    param_var->param_binding_begin = idx;
+            param_var->param_binding_swizzle = SWIZZLE_XYZW;
+         }
+	 param_var->param_binding_length++;
+      }
+   }
+   else {
+      idx = add_state_reference(prog->Parameters, state_tokens);
+      if (param_var->param_binding_begin == ~0U) {
+	 param_var->param_binding_begin = idx;
+         param_var->param_binding_swizzle = SWIZZLE_XYZW;
+      }
+      param_var->param_binding_length++;
+   }
+
+   return idx;
+}
+
+
+/**
+ * Put a float/vector constant/literal into the parameter list.
+ * \param param_var  returns info about the parameter/constant's location,
+ *                   binding, type, etc.
+ * \param vec  the vector/constant to add
+ * \param allowSwizzle  if true, try to consolidate constants which only differ
+ *                      by a swizzle.  We don't want to do this when building
+ *                      arrays of constants that may be indexed indirectly.
+ * \return index of the constant in the parameter list.
+ */
+int
+initialize_symbol_from_const(struct gl_program *prog,
+			     struct asm_symbol *param_var, 
+			     const struct asm_vector *vec,
+                             GLboolean allowSwizzle)
+{
+   unsigned swizzle;
+   const int idx = _mesa_add_unnamed_constant(prog->Parameters,
+                                              vec->data, vec->count,
+                                              allowSwizzle ? &swizzle : NULL);
+
+   param_var->type = at_param;
+   param_var->param_binding_type = PROGRAM_CONSTANT;
+
+   if (param_var->param_binding_begin == ~0U) {
+      param_var->param_binding_begin = idx;
+      param_var->param_binding_swizzle = allowSwizzle ? swizzle : SWIZZLE_XYZW;
+   }
+   param_var->param_binding_length++;
+
+   return idx;
+}
+
+
+char *
+make_error_string(const char *fmt, ...)
+{
+   int length;
+   char *str;
+   va_list args;
+
+
+   /* Call vsnprintf once to determine how large the final string is.  Call it
+    * again to do the actual formatting.  from the vsnprintf manual page:
+    *
+    *    Upon successful return, these functions return the number of
+    *    characters printed  (not including the trailing '\0' used to end
+    *    output to strings).
+    */
+   va_start(args, fmt);
+   length = 1 + vsnprintf(NULL, 0, fmt, args);
+   va_end(args);
+
+   str = malloc(length);
+   if (str) {
+      va_start(args, fmt);
+      vsnprintf(str, length, fmt, args);
+      va_end(args);
+   }
+
+   return str;
+}
+
+
+void
+yyerror(YYLTYPE *locp, struct asm_parser_state *state, const char *s)
+{
+   char *err_str;
+
+
+   err_str = make_error_string("glProgramStringARB(%s)\n", s);
+   if (err_str) {
+      _mesa_error(state->ctx, GL_INVALID_OPERATION, "%s", err_str);
+      free(err_str);
+   }
+
+   err_str = make_error_string("line %u, char %u: error: %s\n",
+			       locp->first_line, locp->first_column, s);
+   _mesa_set_program_error(state->ctx, locp->position, err_str);
+
+   if (err_str) {
+      free(err_str);
+   }
+}
+
+
+GLboolean
+_mesa_parse_arb_program(struct gl_context *ctx, GLenum target, const GLubyte *str,
+			GLsizei len, struct asm_parser_state *state)
+{
+   struct asm_instruction *inst;
+   unsigned i;
+   GLubyte *strz;
+   GLboolean result = GL_FALSE;
+   void *temp;
+   struct asm_symbol *sym;
+
+   state->ctx = ctx;
+   state->prog->Target = target;
+   state->prog->Parameters = _mesa_new_parameter_list();
+
+   /* Make a copy of the program string and force it to be NUL-terminated.
+    */
+   strz = (GLubyte *) malloc(len + 1);
+   if (strz == NULL) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
+      return GL_FALSE;
+   }
+   memcpy (strz, str, len);
+   strz[len] = '\0';
+
+   state->prog->String = strz;
+
+   state->st = _mesa_symbol_table_ctor();
+
+   state->limits = (target == GL_VERTEX_PROGRAM_ARB)
+      ? & ctx->Const.VertexProgram
+      : & ctx->Const.FragmentProgram;
+
+   state->MaxTextureImageUnits = ctx->Const.MaxTextureImageUnits;
+   state->MaxTextureCoordUnits = ctx->Const.MaxTextureCoordUnits;
+   state->MaxTextureUnits = ctx->Const.MaxTextureUnits;
+   state->MaxClipPlanes = ctx->Const.MaxClipPlanes;
+   state->MaxLights = ctx->Const.MaxLights;
+   state->MaxProgramMatrices = ctx->Const.MaxProgramMatrices;
+
+   state->state_param_enum = (target == GL_VERTEX_PROGRAM_ARB)
+      ? STATE_VERTEX_PROGRAM : STATE_FRAGMENT_PROGRAM;
+
+   _mesa_set_program_error(ctx, -1, NULL);
+
+   _mesa_program_lexer_ctor(& state->scanner, state, (const char *) str, len);
+   yyparse(state);
+   _mesa_program_lexer_dtor(state->scanner);
+
+
+   if (ctx->Program.ErrorPos != -1) {
+      goto error;
+   }
+
+   if (! _mesa_layout_parameters(state)) {
+      struct YYLTYPE loc;
+
+      loc.first_line = 0;
+      loc.first_column = 0;
+      loc.position = len;
+
+      yyerror(& loc, state, "invalid PARAM usage");
+      goto error;
+   }
+
+
+   
+   /* Add one instruction to store the "END" instruction.
+    */
+   state->prog->Instructions =
+      _mesa_alloc_instructions(state->prog->NumInstructions + 1);
+   inst = state->inst_head;
+   for (i = 0; i < state->prog->NumInstructions; i++) {
+      struct asm_instruction *const temp = inst->next;
+
+      state->prog->Instructions[i] = inst->Base;
+      inst = temp;
+   }
+
+   /* Finally, tag on an OPCODE_END instruction */
+   {
+      const GLuint numInst = state->prog->NumInstructions;
+      _mesa_init_instructions(state->prog->Instructions + numInst, 1);
+      state->prog->Instructions[numInst].Opcode = OPCODE_END;
+   }
+   state->prog->NumInstructions++;
+
+   state->prog->NumParameters = state->prog->Parameters->NumParameters;
+   state->prog->NumAttributes = _mesa_bitcount(state->prog->InputsRead);
+
+   /*
+    * Initialize native counts to logical counts.  The device driver may
+    * change them if program is translated into a hardware program.
+    */
+   state->prog->NumNativeInstructions = state->prog->NumInstructions;
+   state->prog->NumNativeTemporaries = state->prog->NumTemporaries;
+   state->prog->NumNativeParameters = state->prog->NumParameters;
+   state->prog->NumNativeAttributes = state->prog->NumAttributes;
+   state->prog->NumNativeAddressRegs = state->prog->NumAddressRegs;
+
+   result = GL_TRUE;
+
+error:
+   for (inst = state->inst_head; inst != NULL; inst = temp) {
+      temp = inst->next;
+      free(inst);
+   }
+
+   state->inst_head = NULL;
+   state->inst_tail = NULL;
+
+   for (sym = state->sym; sym != NULL; sym = temp) {
+      temp = sym->next;
+
+      free((void *) sym->name);
+      free(sym);
+   }
+   state->sym = NULL;
+
+   _mesa_symbol_table_dtor(state->st);
+   state->st = NULL;
+
+   return result;
+}
diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c
index fc5f60e92..836c76fe8 100644
--- a/mesalib/src/mesa/vbo/vbo_save_api.c
+++ b/mesalib/src/mesa/vbo/vbo_save_api.c
@@ -633,7 +633,7 @@ static void _save_reset_vertex( struct gl_context *ctx )
 
 
 
-#define ERROR(err)   _mesa_compile_error( ctx, GL_INVALID_ENUM, __FUNCTION__ );
+#define ERROR(err)   _mesa_compile_error( ctx, err, __FUNCTION__ );
 
 
 /* Only one size for each attribute may be active at once.  Eg. if