From: José Fonseca <jfonseca@vmware.com>
Date: Wed, 20 Nov 2013 17:31:43 +0000 (+0000)
Subject: tgsi_exec: Fix mask calculation for emit_kill_if.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=edd9efc2fb99ed67df38fa53ecd0283b8156c4ec;p=mesa.git

tgsi_exec: Fix mask calculation for emit_kill_if.

Same as Si Chen's commit e7a5905d8a3960b0981750f8131e3af9acbfcdb8 for
tgsi_exec module.

Not actually tested, because softpipe is failing the test that caught
this bug due to unrelated issues.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
---

diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index 6db1238a60d..b6149074ab7 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -1610,6 +1610,9 @@ exec_kill_if(struct tgsi_exec_machine *mach,
             kilmask |= 1 << i;
    }
 
+   /* restrict to fragments currently executing */
+   kilmask &= mach->ExecMask;
+
    mach->Temps[TEMP_KILMASK_I].xyzw[TEMP_KILMASK_C].u[0] |= kilmask;
 }