diff options
| author | Kenneth Graunke <[email protected]> | 2016-03-01 16:26:09 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-03-01 17:11:29 -0800 |
| commit | 89e421369c54a8edc4930352e062f03b5c66b886 (patch) | |
| tree | 54ec1f2d99454da125abe0ed49164b1c47fd9d36 /src/gallium/drivers/r300/r300_flush.c | |
| parent | e941fd84707d4ed04a683f8862d184956a60f9ad (diff) | |
| parent | 1be953797ea4ae31193ab40bd35133eef38ae0ce (diff) | |
Merge remote-tracking branch 'origin/master' into vulkan
Diffstat (limited to 'src/gallium/drivers/r300/r300_flush.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_flush.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c index 46b23667a8d..7a75b43a53e 100644 --- a/src/gallium/drivers/r300/r300_flush.c +++ b/src/gallium/drivers/r300/r300_flush.c @@ -45,7 +45,7 @@ static void r300_flush_and_cleanup(struct r300_context *r300, unsigned flags, r500_emit_index_bias(r300, 0); /* The DDX doesn't set these regs. */ - if (r300->screen->info.drm_minor >= 6) { + { CS_LOCALS(r300); OUT_CS_REG_SEQ(R300_GB_MSPOS0, 2); OUT_CS(0x66666666); @@ -78,9 +78,7 @@ void r300_flush(struct pipe_context *pipe, { struct r300_context *r300 = r300_context(pipe); - if (r300->screen->info.drm_minor >= 12) { - flags |= RADEON_FLUSH_KEEP_TILING_FLAGS; - } + flags |= RADEON_FLUSH_KEEP_TILING_FLAGS; if (r300->dirty_hw) { r300_flush_and_cleanup(r300, flags, fence); |