VERY experimental Nintendo Switch 2 emulator
C++
vulkan_common: fix indirect draw with count
Liam73c62bbc7a8a
diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.hindex 4cfb20bc21..0662a2d9fc 100644--- a/src/video_core/vulkan_common/vulkan_device.h+++ b/src/video_core/vulkan_common/vulkan_device.h@@ -65,6 +65,7 @@EXTENSION(EXT, SHADER_VIEWPORT_INDEX_LAYER, shader_viewport_index_layer) \EXTENSION(EXT, TOOLING_INFO, tooling_info) \EXTENSION(EXT, VERTEX_ATTRIBUTE_DIVISOR, vertex_attribute_divisor) \+ EXTENSION(KHR, DRAW_INDIRECT_COUNT, draw_indirect_count) \EXTENSION(KHR, DRIVER_PROPERTIES, driver_properties) \EXTENSION(KHR, EXTERNAL_MEMORY_FD, external_memory_fd) \EXTENSION(KHR, PUSH_DESCRIPTOR, push_descriptor) \diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cppindex 61be1fce10..486d4dfaff 100644--- a/src/video_core/vulkan_common/vulkan_wrapper.cpp+++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp@@ -96,8 +96,8 @@ void Load(VkDevice device, DeviceDispatch& dld) noexcept {X(vkCmdDrawIndexed);X(vkCmdDrawIndirect);X(vkCmdDrawIndexedIndirect);- X(vkCmdDrawIndirectCountKHR);- X(vkCmdDrawIndexedIndirectCountKHR);+ X(vkCmdDrawIndirectCount);+ X(vkCmdDrawIndexedIndirectCount);X(vkCmdEndQuery);X(vkCmdEndRenderPass);X(vkCmdEndTransformFeedbackEXT);@@ -221,6 +221,12 @@ void Load(VkDevice device, DeviceDispatch& dld) noexcept {if (!dld.vkResetQueryPool) {Proc(dld.vkResetQueryPool, dld, "vkResetQueryPoolEXT", device);}++ // Support for draw indirect with count is optional in Vulkan 1.2+ if (!dld.vkCmdDrawIndirectCount) {+ Proc(dld.vkCmdDrawIndirectCount, dld, "vkCmdDrawIndirectCountKHR", device);+ Proc(dld.vkCmdDrawIndexedIndirectCount, dld, "vkCmdDrawIndexedIndirectCountKHR", device);+ }#undef X}diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.hindex 412779b51b..e86f661cb0 100644--- a/src/video_core/vulkan_common/vulkan_wrapper.h+++ b/src/video_core/vulkan_common/vulkan_wrapper.h@@ -215,8 +215,8 @@ struct DeviceDispatch : InstanceDispatch {PFN_vkCmdDrawIndexed vkCmdDrawIndexed{};PFN_vkCmdDrawIndirect vkCmdDrawIndirect{};PFN_vkCmdDrawIndexedIndirect vkCmdDrawIndexedIndirect{};- PFN_vkCmdDrawIndirectCountKHR vkCmdDrawIndirectCountKHR{};- PFN_vkCmdDrawIndexedIndirectCountKHR vkCmdDrawIndexedIndirectCountKHR{};+ PFN_vkCmdDrawIndirectCount vkCmdDrawIndirectCount{};+ PFN_vkCmdDrawIndexedIndirectCount vkCmdDrawIndexedIndirectCount{};PFN_vkCmdEndDebugUtilsLabelEXT vkCmdEndDebugUtilsLabelEXT{};PFN_vkCmdEndQuery vkCmdEndQuery{};PFN_vkCmdEndRenderPass vkCmdEndRenderPass{};@@ -1065,15 +1065,15 @@ public:void DrawIndirectCount(VkBuffer src_buffer, VkDeviceSize src_offset, VkBuffer count_buffer,VkDeviceSize count_offset, u32 draw_count, u32 stride) const noexcept {- dld->vkCmdDrawIndirectCountKHR(handle, src_buffer, src_offset, count_buffer, count_offset,- draw_count, stride);+ dld->vkCmdDrawIndirectCount(handle, src_buffer, src_offset, count_buffer, count_offset,+ draw_count, stride);}void DrawIndexedIndirectCount(VkBuffer src_buffer, VkDeviceSize src_offset,VkBuffer count_buffer, VkDeviceSize count_offset, u32 draw_count,u32 stride) const noexcept {- dld->vkCmdDrawIndexedIndirectCountKHR(handle, src_buffer, src_offset, count_buffer,- count_offset, draw_count, stride);+ dld->vkCmdDrawIndexedIndirectCount(handle, src_buffer, src_offset, count_buffer,+ count_offset, draw_count, stride);}void ClearAttachments(Span<VkClearAttachment> attachments,