From: Keith Whitwell <keith@tungstengraphics.com>
Date: Thu, 18 Sep 2008 18:06:20 +0000 (+0100)
Subject: Merge commit 'origin/gallium-0.1' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a8d1521f30766b6a4707aa9966e1f2f9c0b3ac00;p=mesa.git

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

Conflicts:

	src/mesa/shader/slang/slang_link.c
---

a8d1521f30766b6a4707aa9966e1f2f9c0b3ac00
diff --cc src/mesa/shader/slang/slang_link.c
index a6390846b26,dd7d5be6d8b..d884be2a75d
--- a/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;
  }