summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2019-11-25 23:58:04 +0100
committerDylan Baker <dylan@pnwbakers.com>2019-11-26 16:43:04 -0800
commit06a95a06e84024cf3a56acc65c1430068c2edd7e (patch)
treeeaf6ca7fe1554802a539a6e7c18d92f09defd609
parent2e8af7b3e0ab6fd39299cde9797c524fd82b33b5 (diff)
radv: Allocate cmdbuffer space for buffer marker write.
Fixes: 946193ae008 "radv: add support for VK_AMD_buffer_marker" Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> (cherry picked from commit 25bc9102d89f4390e0edc0a5f09fcde9de80f776)
-rw-r--r--src/amd/vulkan/radv_cmd_buffer.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 9211eeec44f..75e01b69548 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -6184,6 +6184,8 @@ void radv_CmdWriteBufferMarkerAMD(
si_emit_cache_flush(cmd_buffer);
+ ASSERTED unsigned cdw_max = radeon_check_space(cmd_buffer->device->ws, cmd_buffer->cs, 12);
+
if (!(pipelineStage & ~VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT)) {
radeon_emit(cs, PKT3(PKT3_COPY_DATA, 4, 0));
radeon_emit(cs, COPY_DATA_SRC_SEL(COPY_DATA_IMM) |
@@ -6203,4 +6205,6 @@ void radv_CmdWriteBufferMarkerAMD(
va, marker,
cmd_buffer->gfx9_eop_bug_va);
}
+
+ assert(cmd_buffer->cs->cdw <= cdw_max);
}