From: Axel Davy <axel.davy@ens.fr>
Date: Sun, 27 Nov 2016 12:14:21 +0000 (+0100)
Subject: st/nine: Convert redundant check to assert in ff ps
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c75415224fdb7f16f4a6f7ed87dbe62479048a9d;p=mesa.git

st/nine: Convert redundant check to assert in ff ps

We disable the alpha stage if the color stage is disabled.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
---

diff --git a/src/gallium/state_trackers/nine/nine_ff.c b/src/gallium/state_trackers/nine/nine_ff.c
index 294fbc89779..f30a98886fa 100644
--- a/src/gallium/state_trackers/nine/nine_ff.c
+++ b/src/gallium/state_trackers/nine/nine_ff.c
@@ -1385,9 +1385,10 @@ nine_ff_build_ps(struct NineDevice9 *device, struct nine_ff_ps_key *key)
         struct ureg_dst dst;
         struct ureg_src arg[3];
 
-        if (key->ts[s].colorop == D3DTOP_DISABLE &&
-            key->ts[s].alphaop == D3DTOP_DISABLE)
+        if (key->ts[s].colorop == D3DTOP_DISABLE) {
+            assert (key->ts[s].alphaop == D3DTOP_DISABLE);
             continue;
+        }
         ps.stage.index = s;
 
         DBG("STAGE[%u]: colorop=%s alphaop=%s\n", s,