From: Axel Davy <axel.davy@ens.fr>
Date: Sat, 1 Oct 2016 10:55:16 +0000 (+0200)
Subject: st/nine: Properly declare sampler states for ff
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=851e4b8d8ab13752693ea7b1d59f11355ae56f7a;p=mesa.git

st/nine: Properly declare sampler states for ff

Fixes a softpipe assertion failure with wine tests

Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
---

diff --git a/src/gallium/state_trackers/nine/nine_ff.c b/src/gallium/state_trackers/nine/nine_ff.c
index 32440bb4a85..cc09926c99d 100644
--- a/src/gallium/state_trackers/nine/nine_ff.c
+++ b/src/gallium/state_trackers/nine/nine_ff.c
@@ -1755,7 +1755,12 @@ nine_ff_get_ps(struct NineDevice9 *device)
             break;
         }
 
-        if (state->ff.tex_stage[s][D3DTSS_COLORARG1] == D3DTA_TEXTURE)
+        if (state->ff.tex_stage[s][D3DTSS_COLORARG0] == D3DTA_TEXTURE ||
+            state->ff.tex_stage[s][D3DTSS_COLORARG1] == D3DTA_TEXTURE ||
+            state->ff.tex_stage[s][D3DTSS_COLORARG2] == D3DTA_TEXTURE ||
+            state->ff.tex_stage[s][D3DTSS_ALPHAARG0] == D3DTA_TEXTURE ||
+            state->ff.tex_stage[s][D3DTSS_ALPHAARG1] == D3DTA_TEXTURE ||
+            state->ff.tex_stage[s][D3DTSS_ALPHAARG2] == D3DTA_TEXTURE)
             sampler_mask |= (1 << s);
 
         if (key.ts[s].colorop != D3DTOP_DISABLE) {