Module: Mesa Branch: staging/19.2 Commit: 570653ca3715037a408ed8c9fdc08f0a85590297 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=570653ca3715037a408ed8c9fdc08f0a85590297
Author: Bas Nieuwenhuizen <[email protected]> Date: Mon Nov 25 23:58:04 2019 +0100 radv: Allocate cmdbuffer space for buffer marker write. Fixes: 946193ae008 "radv: add support for VK_AMD_buffer_marker" Reviewed-by: Samuel Pitoiset <[email protected]> (cherry picked from commit 25bc9102d89f4390e0edc0a5f09fcde9de80f776) --- src/amd/vulkan/radv_cmd_buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index cdb63ad70a4..a42db263f8d 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -6001,6 +6001,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) | @@ -6020,4 +6022,6 @@ void radv_CmdWriteBufferMarkerAMD( va, marker, cmd_buffer->gfx9_eop_bug_va); } + + assert(cmd_buffer->cs->cdw <= cdw_max); } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
