commit 27cff4402e9582fed8152e88a2c36e488bf76198
author Brian <brian.paul@tungstengraphics.com> Wed Jan 16 13:54:32 2008 -0700
committer Brian <brian.paul@tungstengraphics.com> Wed Jan 16 13:54:32 2008 -0700
tree 962a8e840cc945fae5243f5c726bbdadc97682d5
parent d11fd189ff84ec24df0fb988e5c3e1a9260e038c

copy UsesKill state in _mesa_combine_programs()

src/mesa/shader/program.c

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index fc53b57..3869e31 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -497,6 +497,13 @@
    newProg->NumInstructions = newLength;
 
    if (newProg->Target == GL_FRAGMENT_PROGRAM_ARB) {
+      struct gl_fragment_program *fprogA, *fprogB, *newFprog;
+      fprogA = (struct gl_fragment_program *) progA;
+      fprogB = (struct gl_fragment_program *) progB;
+      newFprog = (struct gl_fragment_program *) newProg;
+
+      newFprog->UsesKill = fprogA->UsesKill || fprogB->UsesKill;
+
       /* connect color outputs/inputs */
       if ((progA->OutputsWritten & (1 << FRAG_RESULT_COLR)) &&
           (progB->InputsRead & (1 << FRAG_ATTRIB_COL0))) {