Merge branch 'glsl2'

Conflicts:
	src/mesa/program/prog_optimize.c

diff --cc src/mesa/SConscript
Simple merge

diff --cc src/mesa/main/mtypes.h
Simple merge

diff --cc src/mesa/program/hash_table.h
Simple merge

diff --cc src/mesa/program/prog_instruction.h
Simple merge

diff --cc src/mesa/program/prog_optimize.c
index c78187c,457ace1..ab87875
--- 1/src/mesa/program/prog_optimize.c
--- 2/src/mesa/program/prog_optimize.c
+++ b/src/mesa/program/prog_optimize.c
@@@ -230,10 -227,10 +235,10 @@@ replace_regs(struct gl_program *prog, g
   * that are written to but never read.  Remove any instructions that
   * write to such registers.  Be careful with condition code setters.
   */
 -static void
 -_mesa_remove_dead_code(struct gl_program *prog)
 +static GLboolean
 +_mesa_remove_dead_code_global(struct gl_program *prog)
  {
-    GLboolean tempRead[MAX_PROGRAM_TEMPS][4];
+    GLboolean tempRead[REG_ALLOCATE_MAX_PROGRAM_TEMPS][4];
     GLboolean *removeInst; /* per-instruction removal flag */
     GLuint i, rem = 0, comp;
  
@@@ -258,8 -255,8 +263,8 @@@
           if (inst->SrcReg[j].File == PROGRAM_TEMPORARY) {
              const GLuint index = inst->SrcReg[j].Index;
              GLuint read_mask;
-             ASSERT(index < MAX_PROGRAM_TEMPS);
+             ASSERT(index < REG_ALLOCATE_MAX_PROGRAM_TEMPS);
 -          read_mask = get_src_arg_mask(inst, j);
 +          read_mask = get_src_arg_mask(inst, j, NO_MASK);
  
              if (inst->SrcReg[j].RelAddr) {
                 if (dbg)

diff --cc src/mesa/program/prog_print.h
Simple merge