Mesa (19.3): radv: Allocate cmdbuffer space for buffer marker write.

[GitLab Mirror]

Module: Mesa
Branch: 19.3
Commit: 06a95a06e84024cf3a56acc65c1430068c2edd7e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=06a95a06e84024cf3a56acc65c1430068c2edd7e

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
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 <samuel.pitoiset at gmail.com>
(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 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);
 }