diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-02-24 22:04:47 +0100 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-03-09 15:02:27 +0100 |
| commit | 60c08aa90bce4c8766a747c8517f7ff6987937f0 (patch) | |
| tree | 049d87112cbb6fca483a302fcf4edd9e91f1b4e7 /src/gallium/drivers/radeonsi/si_state_draw.c | |
| parent | 970b979da1639d57e89169f96cc0064db9dae43a (diff) | |
| download | external_mesa3d-60c08aa90bce4c8766a747c8517f7ff6987937f0.zip external_mesa3d-60c08aa90bce4c8766a747c8517f7ff6987937f0.tar.gz external_mesa3d-60c08aa90bce4c8766a747c8517f7ff6987937f0.tar.bz2 | |
gallium/radeon: disable CMASK on handle export if sharing doesn't allow it (v2)
v2: remove the list of all contexts
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_state_draw.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state_draw.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/gallium/drivers/radeonsi/si_state_draw.c b/src/gallium/drivers/radeonsi/si_state_draw.c index 91ccd07..5d094c7 100644 --- a/src/gallium/drivers/radeonsi/si_state_draw.c +++ b/src/gallium/drivers/radeonsi/si_state_draw.c @@ -763,7 +763,7 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) struct si_context *sctx = (struct si_context *)ctx; struct si_state_rasterizer *rs = sctx->queued.named.rasterizer; struct pipe_index_buffer ib = {}; - unsigned mask; + unsigned mask, dirty_fb_counter; if (!info->count && !info->indirect && (info->indexed || !info->count_from_stream_output)) @@ -782,6 +782,16 @@ void si_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info) return; } + /* Re-emit the framebuffer state if needed. */ + dirty_fb_counter = p_atomic_read(&sctx->b.screen->dirty_fb_counter); + if (dirty_fb_counter != sctx->b.last_dirty_fb_counter) { + sctx->b.last_dirty_fb_counter = dirty_fb_counter; + sctx->framebuffer.dirty_cbufs |= + ((1 << sctx->framebuffer.state.nr_cbufs) - 1); + sctx->framebuffer.dirty_zsbuf = true; + si_mark_atom_dirty(sctx, &sctx->framebuffer.atom); + } + si_decompress_textures(sctx); /* Set the rasterization primitive type. |