From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 16 Jan 2008 20:54:32 +0000 (-0700)
Subject: copy UsesKill state in _mesa_combine_programs()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=27cff4402e9582fed8152e88a2c36e488bf76198;p=mesa.git

copy UsesKill state in _mesa_combine_programs()
---

diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index fc53b5737cb..3869e317147 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -497,6 +497,13 @@ _mesa_combine_programs(GLcontext *ctx,
    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))) {