Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	src/mesa/shader/slang/slang_link.c

diff --cc progs/fp/fp-tri.c
Simple merge

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

diff --cc src/mesa/shader/slang/slang_link.c
index a6390846b26da3aa63e42ff9fef544342846ce5a,dd7d5be6d8b0393eaf648f336dfb1d272f91ec01..d884be2a75df805fe23d39484409f57e5f737065
--- 1/src/mesa/shader/slang/slang_link.c
--- 2/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@@ -378,25 -414,12 +414,11 @@@ _slang_update_inputs_outputs(struct gl_
        if (inst->DstReg.File == PROGRAM_OUTPUT) {
           prog->OutputsWritten |= 1 << inst->DstReg.Index;
        }
+       else if (inst->DstReg.File == PROGRAM_ADDRESS) {
+          maxAddrReg = MAX2(maxAddrReg, inst->DstReg.Index + 1);
+       }
     }
- }
- 
- 
- /** cast wrapper */
- static struct gl_vertex_program *
- vertex_program(struct gl_program *prog)
- {
-    assert(prog->Target == GL_VERTEX_PROGRAM_ARB);
-    return (struct gl_vertex_program *) prog;
- }
- 
--
- /** cast wrapper */
- static struct gl_fragment_program *
- fragment_program(struct gl_program *prog)
- {
-    assert(prog->Target == GL_FRAGMENT_PROGRAM_ARB);
-    return (struct gl_fragment_program *) prog;
+    prog->NumAddressRegs = maxAddrReg;
  }
  
  

diff --cc src/mesa/vbo/vbo_context.c
Simple merge