diff options
| author | Axel Davy <axel.davy@ens.fr> | 2016-10-01 12:55:16 +0200 |
|---|---|---|
| committer | Axel Davy <axel.davy@ens.fr> | 2016-10-10 23:43:50 +0200 |
| commit | 851e4b8d8ab13752693ea7b1d59f11355ae56f7a (patch) | |
| tree | c2b41d55204177c3c70adbfd7f4df451d563569a /src/gallium/state_trackers | |
| parent | 5ce23c1689563a6b6a8ad09ac065cb71db9f4641 (diff) | |
| download | external_mesa3d-851e4b8d8ab13752693ea7b1d59f11355ae56f7a.zip external_mesa3d-851e4b8d8ab13752693ea7b1d59f11355ae56f7a.tar.gz external_mesa3d-851e4b8d8ab13752693ea7b1d59f11355ae56f7a.tar.bz2 | |
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>
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_ff.c | 7 |
1 files changed, 6 insertions, 1 deletions
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) { |