From 180d16af7a99fb8e6b7105f06a2c11d9fdb9b4e3 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 11 Oct 2023 01:49:42 -0700
Subject: [PATCH] Thunks: Fixes missing vulkan definitions

A couple of games were hitting these. Not sure how they were missed in
PR #3159 but adds the missing one.

Small rearrangement to make this easier as well. Hopefully thunk stuff
lands sooner rather than later to automate this for Vulkan.

Maybe `-isystem` instead of `-I` needs to be used unlike what #2076,
might depend on what is installed on the host system.
---
 ThunkLibs/libvulkan/libvulkan_interface.cpp | 43 +++++++++++++++------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/ThunkLibs/libvulkan/libvulkan_interface.cpp b/ThunkLibs/libvulkan/libvulkan_interface.cpp
index 6de4c48fa..ff4f3ded6 100644
--- a/ThunkLibs/libvulkan/libvulkan_interface.cpp
+++ b/ThunkLibs/libvulkan/libvulkan_interface.cpp
@@ -21,7 +21,14 @@ struct fex_gen_config : fexgen::generate_guest_symtable, fexgen::indirect_guest_
 };
 
 template<> struct fex_gen_config<vkCreateInstance> : fexgen::custom_host_impl {};
-template<> struct fex_gen_config<vkDestroyInstance> {};
+template<> struct fex_gen_config<vkCreateDevice> : fexgen::custom_host_impl {};
+template<> struct fex_gen_config<vkAllocateMemory> : fexgen::custom_host_impl {};
+template<> struct fex_gen_config<vkFreeMemory> : fexgen::custom_host_impl {};
+template<> struct fex_gen_config<vkCreateShaderModule> : fexgen::custom_host_impl {};
+template<> struct fex_gen_config<vkCreateDebugReportCallbackEXT> : fexgen::custom_host_impl {};
+template<> struct fex_gen_config<vkDestroyDebugReportCallbackEXT> : fexgen::custom_host_impl {};
+
+// Begin auto-generated result.
 template<> struct fex_gen_config<vkEnumeratePhysicalDevices> {};
 template<> struct fex_gen_config<vkGetPhysicalDeviceFeatures> {};
 template<> struct fex_gen_config<vkGetPhysicalDeviceFormatProperties> {};
@@ -29,10 +36,6 @@ template<> struct fex_gen_config<vkGetPhysicalDeviceImageFormatProperties> {};
 template<> struct fex_gen_config<vkGetPhysicalDeviceProperties> {};
 template<> struct fex_gen_config<vkGetPhysicalDeviceQueueFamilyProperties> {};
 template<> struct fex_gen_config<vkGetPhysicalDeviceMemoryProperties> {};
-// Manually implemented
-// template<> struct fex_gen_config<vkGetInstanceProcAddr> {};
-// template<> struct fex_gen_config<vkGetDeviceProcAddr> {};
-template<> struct fex_gen_config<vkCreateDevice> : fexgen::custom_host_impl {};
 template<> struct fex_gen_config<vkDestroyDevice> {};
 template<> struct fex_gen_config<vkEnumerateInstanceExtensionProperties> {};
 template<> struct fex_gen_config<vkEnumerateDeviceExtensionProperties> {};
@@ -42,8 +45,6 @@ template<> struct fex_gen_config<vkGetDeviceQueue> {};
 template<> struct fex_gen_config<vkQueueSubmit> {};
 template<> struct fex_gen_config<vkQueueWaitIdle> {};
 template<> struct fex_gen_config<vkDeviceWaitIdle> {};
-template<> struct fex_gen_config<vkAllocateMemory> : fexgen::custom_host_impl {};
-template<> struct fex_gen_config<vkFreeMemory> : fexgen::custom_host_impl {};
 template<> struct fex_gen_config<vkMapMemory> {};
 template<> struct fex_gen_config<vkUnmapMemory> {};
 template<> struct fex_gen_config<vkFlushMappedMemoryRanges> {};
@@ -80,7 +81,6 @@ template<> struct fex_gen_config<vkDestroyImage> {};
 template<> struct fex_gen_config<vkGetImageSubresourceLayout> {};
 template<> struct fex_gen_config<vkCreateImageView> {};
 template<> struct fex_gen_config<vkDestroyImageView> {};
-template<> struct fex_gen_config<vkCreateShaderModule> : fexgen::custom_host_impl {};
 template<> struct fex_gen_config<vkDestroyShaderModule> {};
 template<> struct fex_gen_config<vkCreatePipelineCache> {};
 template<> struct fex_gen_config<vkDestroyPipelineCache> {};
@@ -341,6 +341,8 @@ template<> struct fex_gen_config<vkDeferredOperationJoinKHR> {};
 template<> struct fex_gen_config<vkGetPipelineExecutablePropertiesKHR> {};
 template<> struct fex_gen_config<vkGetPipelineExecutableStatisticsKHR> {};
 template<> struct fex_gen_config<vkGetPipelineExecutableInternalRepresentationsKHR> {};
+template<> struct fex_gen_config<vkMapMemory2KHR> {};
+template<> struct fex_gen_config<vkUnmapMemory2KHR> {};
 template<> struct fex_gen_config<vkCmdSetEvent2KHR> {};
 template<> struct fex_gen_config<vkCmdResetEvent2KHR> {};
 template<> struct fex_gen_config<vkCmdWaitEvents2KHR> {};
@@ -359,8 +361,11 @@ template<> struct fex_gen_config<vkCmdTraceRaysIndirect2KHR> {};
 template<> struct fex_gen_config<vkGetDeviceBufferMemoryRequirementsKHR> {};
 template<> struct fex_gen_config<vkGetDeviceImageMemoryRequirementsKHR> {};
 template<> struct fex_gen_config<vkGetDeviceImageSparseMemoryRequirementsKHR> {};
-template<> struct fex_gen_config<vkCreateDebugReportCallbackEXT> : fexgen::custom_host_impl {};
-template<> struct fex_gen_config<vkDestroyDebugReportCallbackEXT> : fexgen::custom_host_impl {};
+template<> struct fex_gen_config<vkCmdBindIndexBuffer2KHR> {};
+template<> struct fex_gen_config<vkGetRenderingAreaGranularityKHR> {};
+template<> struct fex_gen_config<vkGetDeviceImageSubresourceLayoutKHR> {};
+template<> struct fex_gen_config<vkGetImageSubresourceLayout2KHR> {};
+template<> struct fex_gen_config<vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR> {};
 template<> struct fex_gen_config<vkDebugReportMessageEXT> {};
 template<> struct fex_gen_config<vkDebugMarkerSetObjectTagEXT> {};
 template<> struct fex_gen_config<vkDebugMarkerSetObjectNameEXT> {};
@@ -396,6 +401,8 @@ template<> struct fex_gen_config<vkGetSwapchainCounterEXT> {};
 template<> struct fex_gen_config<vkGetRefreshCycleDurationGOOGLE> {};
 template<> struct fex_gen_config<vkGetPastPresentationTimingGOOGLE> {};
 template<> struct fex_gen_config<vkCmdSetDiscardRectangleEXT> {};
+template<> struct fex_gen_config<vkCmdSetDiscardRectangleEnableEXT> {};
+template<> struct fex_gen_config<vkCmdSetDiscardRectangleModeEXT> {};
 template<> struct fex_gen_config<vkSetHdrMetadataEXT> {};
 template<> struct fex_gen_config<vkSetDebugUtilsObjectNameEXT> {};
 template<> struct fex_gen_config<vkSetDebugUtilsObjectTagEXT> {};
@@ -438,6 +445,7 @@ template<> struct fex_gen_config<vkGetCalibratedTimestampsEXT> {};
 template<> struct fex_gen_config<vkCmdDrawMeshTasksNV> {};
 template<> struct fex_gen_config<vkCmdDrawMeshTasksIndirectNV> {};
 template<> struct fex_gen_config<vkCmdDrawMeshTasksIndirectCountNV> {};
+template<> struct fex_gen_config<vkCmdSetExclusiveScissorEnableNV> {};
 template<> struct fex_gen_config<vkCmdSetExclusiveScissorNV> {};
 template<> struct fex_gen_config<vkCmdSetCheckpointNV> {};
 template<> struct fex_gen_config<vkGetQueueCheckpointDataNV> {};
@@ -470,6 +478,11 @@ template<> struct fex_gen_config<vkCmdSetDepthCompareOpEXT> {};
 template<> struct fex_gen_config<vkCmdSetDepthBoundsTestEnableEXT> {};
 template<> struct fex_gen_config<vkCmdSetStencilTestEnableEXT> {};
 template<> struct fex_gen_config<vkCmdSetStencilOpEXT> {};
+template<> struct fex_gen_config<vkCopyMemoryToImageEXT> {};
+template<> struct fex_gen_config<vkCopyImageToMemoryEXT> {};
+template<> struct fex_gen_config<vkCopyImageToImageEXT> {};
+template<> struct fex_gen_config<vkTransitionImageLayoutEXT> {};
+template<> struct fex_gen_config<vkGetImageSubresourceLayout2EXT> {};
 template<> struct fex_gen_config<vkReleaseSwapchainImagesEXT> {};
 template<> struct fex_gen_config<vkGetGeneratedCommandsMemoryRequirementsNV> {};
 template<> struct fex_gen_config<vkCmdPreprocessGeneratedCommandsNV> {};
@@ -477,6 +490,7 @@ template<> struct fex_gen_config<vkCmdExecuteGeneratedCommandsNV> {};
 template<> struct fex_gen_config<vkCmdBindPipelineShaderGroupNV> {};
 template<> struct fex_gen_config<vkCreateIndirectCommandsLayoutNV> {};
 template<> struct fex_gen_config<vkDestroyIndirectCommandsLayoutNV> {};
+template<> struct fex_gen_config<vkCmdSetDepthBias2EXT> {};
 template<> struct fex_gen_config<vkAcquireDrmDisplayEXT> {};
 template<> struct fex_gen_config<vkGetDrmDisplayEXT> {};
 template<> struct fex_gen_config<vkCreatePrivateDataSlotEXT> {};
@@ -495,7 +509,6 @@ template<> struct fex_gen_config<vkGetImageViewOpaqueCaptureDescriptorDataEXT> {
 template<> struct fex_gen_config<vkGetSamplerOpaqueCaptureDescriptorDataEXT> {};
 template<> struct fex_gen_config<vkGetAccelerationStructureOpaqueCaptureDescriptorDataEXT> {};
 template<> struct fex_gen_config<vkCmdSetFragmentShadingRateEnumNV> {};
-template<> struct fex_gen_config<vkGetImageSubresourceLayout2EXT> {};
 template<> struct fex_gen_config<vkGetDeviceFaultInfoEXT> {};
 template<> struct fex_gen_config<vkCmdSetVertexInputEXT> {};
 template<> struct fex_gen_config<vkGetDeviceSubpassShadingMaxWorkgroupSizeHUAWEI> {};
@@ -534,6 +547,9 @@ template<> struct fex_gen_config<vkCmdCopyMemoryIndirectNV> {};
 template<> struct fex_gen_config<vkCmdCopyMemoryToImageIndirectNV> {};
 template<> struct fex_gen_config<vkCmdDecompressMemoryNV> {};
 template<> struct fex_gen_config<vkCmdDecompressMemoryIndirectCountNV> {};
+template<> struct fex_gen_config<vkGetPipelineIndirectMemoryRequirementsNV> {};
+template<> struct fex_gen_config<vkCmdUpdatePipelineIndirectBufferNV> {};
+template<> struct fex_gen_config<vkGetPipelineIndirectDeviceAddressNV> {};
 template<> struct fex_gen_config<vkCmdSetTessellationDomainOriginEXT> {};
 template<> struct fex_gen_config<vkCmdSetDepthClampEnableEXT> {};
 template<> struct fex_gen_config<vkCmdSetPolygonModeEXT> {};
@@ -572,8 +588,13 @@ template<> struct fex_gen_config<vkCreateOpticalFlowSessionNV> {};
 template<> struct fex_gen_config<vkDestroyOpticalFlowSessionNV> {};
 template<> struct fex_gen_config<vkBindOpticalFlowSessionImageNV> {};
 template<> struct fex_gen_config<vkCmdOpticalFlowExecuteNV> {};
+template<> struct fex_gen_config<vkCreateShadersEXT> {};
+template<> struct fex_gen_config<vkDestroyShaderEXT> {};
+template<> struct fex_gen_config<vkGetShaderBinaryDataEXT> {};
+template<> struct fex_gen_config<vkCmdBindShadersEXT> {};
 template<> struct fex_gen_config<vkGetFramebufferTilePropertiesQCOM> {};
 template<> struct fex_gen_config<vkGetDynamicRenderingTilePropertiesQCOM> {};
+template<> struct fex_gen_config<vkCmdSetAttachmentFeedbackLoopEnableEXT> {};
 template<> struct fex_gen_config<vkCreateAccelerationStructureKHR> {};
 template<> struct fex_gen_config<vkDestroyAccelerationStructureKHR> {};
 template<> struct fex_gen_config<vkCmdBuildAccelerationStructuresKHR> {};