radv/gfx10: add a separate flag for creating a GDS OA buffer

[mesa.git] / src / amd / vulkan / radv_cmd_buffer.c

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index b35d63eb5b1c26ccb3a01e87fb43fb512b47ffe9..f81e5fa91dc15e985b1c616c79262bc2d8e93bb4 100644 (file)
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -340,6 +340,7 @@ radv_reset_cmd_buffer(struct radv_cmd_buffer *cmd_buffer)
        cmd_buffer->gsvs_ring_size_needed = 0;
        cmd_buffer->tess_rings_needed = false;
        cmd_buffer->gds_needed = false;
+       cmd_buffer->gds_oa_needed = false;
        cmd_buffer->sample_positions_needed = false;
 
        if (cmd_buffer->upload.upload_bo)
@@ -3152,11 +3153,11 @@ radv_cmd_state_setup_attachments(struct radv_cmd_buffer *cmd_buffer,
                                 const VkRenderPassBeginInfo *info)
 {
        struct radv_cmd_state *state = &cmd_buffer->state;
-       const struct VkRenderPassAttachmentBeginInfoKHR *attachment_info = NULL;
+       const struct VkRenderPassAttachmentBeginInfo *attachment_info = NULL;
 
        if (info) {
                attachment_info = vk_find_struct_const(info->pNext,
-                                                      RENDER_PASS_ATTACHMENT_BEGIN_INFO_KHR);
+                                                      RENDER_PASS_ATTACHMENT_BEGIN_INFO);
        }
 
 
@@ -4828,7 +4829,7 @@ void radv_CmdDrawIndexedIndirect(
        radv_draw(cmd_buffer, &info);
 }
 
-void radv_CmdDrawIndirectCountKHR(
+void radv_CmdDrawIndirectCount(
        VkCommandBuffer                             commandBuffer,
        VkBuffer                                    _buffer,
        VkDeviceSize                                offset,
@@ -4852,7 +4853,7 @@ void radv_CmdDrawIndirectCountKHR(
        radv_draw(cmd_buffer, &info);
 }
 
-void radv_CmdDrawIndexedIndirectCountKHR(
+void radv_CmdDrawIndexedIndirectCount(
        VkCommandBuffer                             commandBuffer,
        VkBuffer                                    _buffer,
        VkDeviceSize                                offset,
@@ -5919,8 +5920,10 @@ radv_set_streamout_enable(struct radv_cmd_buffer *cmd_buffer, bool enable)
             (old_hw_enabled_mask != so->hw_enabled_mask)))
                radv_emit_streamout_enable(cmd_buffer);
 
-       if (cmd_buffer->device->physical_device->use_ngg_streamout)
+       if (cmd_buffer->device->physical_device->use_ngg_streamout) {
                cmd_buffer->gds_needed = true;
+               cmd_buffer->gds_oa_needed = true;
+       }
 }
 
 static void radv_flush_vgt_streamout(struct radv_cmd_buffer *cmd_buffer)