diff options
| author | Michel Dänzer <[email protected]> | 2013-08-30 17:45:31 +0200 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2013-09-02 17:25:27 +0200 |
| commit | 6b5c802c30ada043ee31cc5e62249ff99bbc865f (patch) | |
| tree | 1eff1985c515879a240fcb4bea7189b052288238 /src/gallium/drivers/radeonsi | |
| parent | 9933b85e122c233ceac7662aec5cf359f888f595 (diff) | |
radeonsi: Don't save/restore FMASK sampler view states for u_blitter
Fixes assertion failues in 24 piglit tests with
MESA_GL_VERSION_OVERRIDE=3.0, 12 of which are now passing.
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi')
| -rw-r--r-- | src/gallium/drivers/radeonsi/r600_blit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/r600_blit.c b/src/gallium/drivers/radeonsi/r600_blit.c index 92b5a153ec3..20c1767fff0 100644 --- a/src/gallium/drivers/radeonsi/r600_blit.c +++ b/src/gallium/drivers/radeonsi/r600_blit.c @@ -76,7 +76,8 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op (void**)rctx->samplers[PIPE_SHADER_FRAGMENT].samplers); util_blitter_save_fragment_sampler_views(rctx->blitter, - util_last_bit(rctx->samplers[PIPE_SHADER_FRAGMENT].views.desc.enabled_mask), + util_last_bit(rctx->samplers[PIPE_SHADER_FRAGMENT].views.desc.enabled_mask & + ((1 << NUM_TEX_UNITS) - 1)), rctx->samplers[PIPE_SHADER_FRAGMENT].views.views); } |