diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-07-15 01:15:42 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-07-19 23:45:06 +0200 |
| commit | 1a1cc67edd4c1ae08b739adaf78e014b828908de (patch) | |
| tree | fcd16095d501e66fd38e24334ee28827be2a25c8 /src/gallium/drivers | |
| parent | 0b626d75241213f2c5535b38aee233d6cdbed781 (diff) | |
| download | external_mesa3d-1a1cc67edd4c1ae08b739adaf78e014b828908de.zip external_mesa3d-1a1cc67edd4c1ae08b739adaf78e014b828908de.tar.gz external_mesa3d-1a1cc67edd4c1ae08b739adaf78e014b828908de.tar.bz2 | |
gallium/radeon: remove RADEON_FLUSH_KEEP_TILING_FLAGS flag
always set
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r300/r300_flush.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_hw_context.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_winsys.h | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_hw_context.c | 3 |
4 files changed, 1 insertions, 10 deletions
diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c index 63182cb..54108d1 100644 --- a/src/gallium/drivers/r300/r300_flush.c +++ b/src/gallium/drivers/r300/r300_flush.c @@ -78,8 +78,6 @@ void r300_flush(struct pipe_context *pipe, { struct r300_context *r300 = r300_context(pipe); - flags |= RADEON_FLUSH_KEEP_TILING_FLAGS; - if (r300->dirty_hw) { r300_flush_and_cleanup(r300, flags, fence); } else { diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index 21565d3..ea6902f 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -274,9 +274,6 @@ void r600_context_gfx_flush(void *context, unsigned flags, radeon_set_context_reg(cs, R_028350_SX_MISC, 0); } - /* force to keep tiling flags */ - flags |= RADEON_FLUSH_KEEP_TILING_FLAGS; - /* Flush the CS. */ ctx->b.ws->cs_flush(cs, flags, fence); diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h index a9c9b9e..ba56936 100644 --- a/src/gallium/drivers/radeon/radeon_winsys.h +++ b/src/gallium/drivers/radeon/radeon_winsys.h @@ -29,8 +29,7 @@ #include "pipebuffer/pb_buffer.h" #define RADEON_FLUSH_ASYNC (1 << 0) -#define RADEON_FLUSH_KEEP_TILING_FLAGS (1 << 1) -#define RADEON_FLUSH_END_OF_FRAME (1 << 2) +#define RADEON_FLUSH_END_OF_FRAME (1 << 1) /* Tiling flags. */ enum radeon_bo_layout { diff --git a/src/gallium/drivers/radeonsi/si_hw_context.c b/src/gallium/drivers/radeonsi/si_hw_context.c index f36a7a0..e2e7afd 100644 --- a/src/gallium/drivers/radeonsi/si_hw_context.c +++ b/src/gallium/drivers/radeonsi/si_hw_context.c @@ -123,9 +123,6 @@ void si_context_gfx_flush(void *context, unsigned flags, si_emit_cache_flush(ctx, NULL); - /* force to keep tiling flags */ - flags |= RADEON_FLUSH_KEEP_TILING_FLAGS; - if (ctx->trace_buf) si_trace_emit(ctx); |