diff options
| author | Nicolai Hähnle <[email protected]> | 2016-09-30 11:46:47 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2016-09-30 12:38:57 +0200 |
| commit | fd9f54223dd8056bc4e9e17c53fe075e33a40f1f (patch) | |
| tree | 4837188bdbceb53a9f5c675e7eb7dd7f32e7ee13 /src/gallium/drivers/radeon/r600_query.c | |
| parent | 3e7cced4b999478dee955e647bb777e1893f8cc6 (diff) | |
gallium/radeon: emit relocations for query fences
This is only needed for r600 which doesn't have ARB_query_buffer_object and
therefore wouldn't really need the fences, but let's be optimistic about
filling in this feature gap eventually.
Cc: Dieter Nützel <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon/r600_query.c')
| -rw-r--r-- | src/gallium/drivers/radeon/r600_query.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index 429ea6a9565..4b6767dd38a 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -616,6 +616,7 @@ static void r600_query_hw_do_emit_stop(struct r600_common_context *ctx, uint64_t va) { struct radeon_winsys_cs *cs = ctx->gfx.cs; + uint64_t fence_va = 0; switch (query->b.type) { case PIPE_QUERY_OCCLUSION_COUNTER: @@ -626,8 +627,7 @@ static void r600_query_hw_do_emit_stop(struct r600_common_context *ctx, radeon_emit(cs, va); radeon_emit(cs, (va >> 32) & 0xFFFF); - va += ctx->max_db * 16 - 8; - r600_gfx_write_fence(ctx, va, 0, 0x80000000); + fence_va = va + ctx->max_db * 16 - 8; break; case PIPE_QUERY_PRIMITIVES_EMITTED: case PIPE_QUERY_PRIMITIVES_GENERATED: @@ -650,8 +650,7 @@ static void r600_query_hw_do_emit_stop(struct r600_common_context *ctx, radeon_emit(cs, 0); radeon_emit(cs, 0); - va += 8; - r600_gfx_write_fence(ctx, va, 0, 0x80000000); + fence_va = va + 8; break; case PIPE_QUERY_PIPELINE_STATISTICS: { unsigned sample_size = (query->result_size - 8) / 2; @@ -662,8 +661,7 @@ static void r600_query_hw_do_emit_stop(struct r600_common_context *ctx, radeon_emit(cs, va); radeon_emit(cs, (va >> 32) & 0xFFFF); - va += sample_size; - r600_gfx_write_fence(ctx, va, 0, 0x80000000); + fence_va = va + sample_size; break; } default: @@ -671,6 +669,9 @@ static void r600_query_hw_do_emit_stop(struct r600_common_context *ctx, } r600_emit_reloc(ctx, &ctx->gfx, query->buffer.buf, RADEON_USAGE_WRITE, RADEON_PRIO_QUERY); + + if (fence_va) + r600_gfx_write_fence(ctx, query->buffer.buf, fence_va, 0, 0x80000000); } static void r600_query_hw_emit_stop(struct r600_common_context *ctx, |