KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Axel Davy 2016-10-01 12:55:16 +02:00
parent 5ce23c1689
commit 851e4b8d8a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/state_trackers/nine/nine_ff.c
View File

@ -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) {