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 <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Fixes: f4e499ec791 "radv: add initial non-conformant radv vulkan driver"

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index eff0fd68c9f5ca23c6bec8e4510d37337c24f306..66610e5233fd4fdd54ed97f2b8fdf34b40487567 100644 (file)
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -1364,6 +1364,10 @@ radv_flush_descriptors(struct radv_cmd_buffer *cmd_buffer,
                radv_flush_indirect_descriptor_sets(cmd_buffer, pipeline);
        }
 
+       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 & (1u << i)))
                        continue;
@@ -1375,6 +1379,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
@@ -1403,6 +1408,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);
@@ -1428,6 +1435,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,