Fixes a softpipe assertion failure with wine tests
Signed-off-by: Axel Davy <[email protected]>
Signed-off-by: Patrick Rudolph <[email protected]>
---
src/gallium/state_trackers/nine/nine_ff.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/gallium/state_trackers/nine/nine_ff.c
b/src/gallium/state_trackers/nine/nine_ff.c
index 32440bb..cc09926 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) {
--
2.10.0
_______________________________________________
mesa-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
