diff options
| author | Dave Airlie <[email protected]> | 2017-02-14 23:58:09 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2017-02-15 00:02:33 +0000 |
| commit | d1640e79328af4a63c056e3ccab299a3bffbede7 (patch) | |
| tree | 984a9b33da2c25b3c0245005cbd3590bbbd332c9 | |
| parent | a3e4fa5495abd12d19c35a23156dbf8898049830 (diff) | |
radv: query cmds should mark a cmd buffer as having draws.
This fixes a regression with the remove non-draw cmd buffers in
queries.
Fixes: 8b47b97215a radv: detect command buffers that do no work and drop them (v2)
Signed-off-by: Dave Airlie <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_query.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index a29a05d4b84..fd5d0659a9e 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -211,6 +211,7 @@ void radv_CmdCopyQueryPoolResults( cmd_buffer->device->ws->cs_add_buffer(cmd_buffer->cs, pool->bo, 8); cmd_buffer->device->ws->cs_add_buffer(cmd_buffer->cs, dst_buffer->bo, 8); + cmd_buffer->no_draws = false; for(unsigned i = 0; i < queryCount; ++i, dest_va += stride) { unsigned query = firstQuery + i; @@ -310,6 +311,7 @@ void radv_CmdBeginQuery( va += pool->stride * query; cmd_buffer->device->ws->cs_add_buffer(cs, pool->bo, 8); + cmd_buffer->no_draws = false; switch (pool->type) { case VK_QUERY_TYPE_OCCLUSION: @@ -343,6 +345,7 @@ void radv_CmdEndQuery( va += pool->stride * query; cmd_buffer->device->ws->cs_add_buffer(cs, pool->bo, 8); + cmd_buffer->no_draws = false; switch (pool->type) { case VK_QUERY_TYPE_OCCLUSION: @@ -394,6 +397,7 @@ void radv_CmdWriteTimestamp( uint64_t query_va = va + pool->stride * query; cmd_buffer->device->ws->cs_add_buffer(cs, pool->bo, 5); + cmd_buffer->no_draws = false; MAYBE_UNUSED unsigned cdw_max = radeon_check_space(cmd_buffer->device->ws, cs, 12); |