From ce2b96dd8b5a6c4ea0c80c6c0f46652a0b591515 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Mon, 29 May 2017 00:18:56 +0200 Subject: [PATCH] radv: Reserve space for descriptor and push constant user SGPR setting. flush_compute_state doesn't reserve a large chunk, so these need their own reservation. Signed-off-by: Bas Nieuwenhuizen Reviewed-by: Dave Airlie Fixes: f4e499ec791 "radv: add initial non-conformant radv vulkan driver" (cherry picked from commit 18efb404cfb38f722a16df7539390cf9a4a71929) [Juan A. Suarez: resolve trivial conflicts] Signed-off-by: Juan A. Suarez Romero Conflicts: src/amd/vulkan/radv_cmd_buffer.c --- src/amd/vulkan/radv_cmd_buffer.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 66e74c29d03..bd1541691a2 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -1334,6 +1334,10 @@ radv_flush_descriptors(struct radv_cmd_buffer *cmd_buffer, if (cmd_buffer->state.push_descriptors_dirty) radv_flush_push_descriptors(cmd_buffer); + MAYBE_UNUSED unsigned cdw_max = radeon_check_space(cmd_buffer->device->ws, + cmd_buffer->cs, + MAX_SETS * MESA_SHADER_STAGES * 4); + for (i = 0; i < MAX_SETS; i++) { if (!(cmd_buffer->state.descriptors_dirty & (1 << i))) continue; @@ -1345,6 +1349,7 @@ radv_flush_descriptors(struct radv_cmd_buffer *cmd_buffer, } cmd_buffer->state.descriptors_dirty = 0; cmd_buffer->state.push_descriptors_dirty = false; + assert(cmd_buffer->cs->cdw <= cdw_max); } static void @@ -1373,6 +1378,8 @@ radv_flush_constants(struct radv_cmd_buffer *cmd_buffer, va = cmd_buffer->device->ws->buffer_get_va(cmd_buffer->upload.upload_bo); va += offset; + MAYBE_UNUSED unsigned cdw_max = radeon_check_space(cmd_buffer->device->ws, + cmd_buffer->cs, MESA_SHADER_STAGES * 4); if (stages & VK_SHADER_STAGE_VERTEX_BIT) radv_emit_userdata_address(cmd_buffer, pipeline, MESA_SHADER_VERTEX, AC_UD_PUSH_CONSTANTS, va); @@ -1398,6 +1405,7 @@ radv_flush_constants(struct radv_cmd_buffer *cmd_buffer, AC_UD_PUSH_CONSTANTS, va); cmd_buffer->push_constant_stages &= ~stages; + assert(cmd_buffer->cs->cdw <= cdw_max); } static void radv_emit_primitive_reset_state(struct radv_cmd_buffer *cmd_buffer,