From 866dde036c4ef7921da2f3cda3cd3a15b9df9b0f Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Wed, 2 Jun 2021 15:05:54 +0530
Subject: [PATCH] vulkan-loader: Fix stdcall export symbols for 32bit.

---
 mingw-w64-vulkan-loader/PKGBUILD         |  20 +--
 mingw-w64-vulkan-loader/libvulkan-32.def | 215 +++++++++++++++++++++++
 2 files changed, 225 insertions(+), 10 deletions(-)
 create mode 100644 mingw-w64-vulkan-loader/libvulkan-32.def

diff --git a/mingw-w64-vulkan-loader/PKGBUILD b/mingw-w64-vulkan-loader/PKGBUILD
index 4bbfcb5031..baabfd9790 100644
--- a/mingw-w64-vulkan-loader/PKGBUILD
+++ b/mingw-w64-vulkan-loader/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-loader")
 provides=("${MINGW_PACKAGE_PREFIX}-vulkan")
 replaces=("${MINGW_PACKAGE_PREFIX}-vulkan")
 pkgver=1.2.179
-pkgrel=1
+pkgrel=2
 pkgdesc='Vulkan Installable Client Driver (ICD) Loader (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -22,18 +22,24 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz"
         002-proper-def-files-for-32bit.patch
         003-generate-pkgconfig-files.patch
-        004-disable-suffix-in-static-lib.patch)
+        004-disable-suffix-in-static-lib.patch
+        libvulkan-32.def)
 sha256sums=('bc035c3735cc5147b98aed4856446ebe7e2512394b8c86193891bb08baf15f66'
             'e02c140457301960c81d7941e01675d5676ca29e5894525c10fb17097d1ced69'
             '97c5ff3d945d2ed5d5a8b9cc8b6199ff55d4e6b210e59143228c4e82d0252cb4'
-            'ee0def2718356a2ed441a786e99a0136b9c425274f660cd4447ed0aff4b0de6a')
+            'ee0def2718356a2ed441a786e99a0136b9c425274f660cd4447ed0aff4b0de6a'
+            '70a65c93c9bd4fece5ea50cdbf77dad615996d9264813c840b19b1c14186b73b')
 
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
-  #patch -p1 -i ${srcdir}/001-build-fix.patch
   patch -p1 -i ${srcdir}/002-proper-def-files-for-32bit.patch
   patch -p1 -i ${srcdir}/003-generate-pkgconfig-files.patch
   patch -p1 -i ${srcdir}/004-disable-suffix-in-static-lib.patch
+
+  # Fix stdcall export symbols for 32bit
+  if [ "${CARCH}" = "i686" ]; then
+    cp -v ${srcdir}/libvulkan-32.def loader/vulkan-1.def
+  fi
 }
 
 build() {
@@ -66,11 +72,5 @@ package() {
   cd ${srcdir}/build-${CARCH}
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --build ./ --target install
 
-  if [ "${CARCH}" = "i686" ]; then
-    rm -f ${pkgdir}${MINGW_PREFIX}/lib/libvulkan.dll.a
-    ${MINGW_PREFIX}/bin/gendef ${pkgdir}${MINGW_PREFIX}/bin/libvulkan-1.dll
-    ${MINGW_PREFIX}/bin/dlltool -k -d libvulkan-1.def -l ${pkgdir}${MINGW_PREFIX}/lib/libvulkan.dll.a
-  fi
-
   install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE.TXT ${pkgdir}${MINGW_PREFIX}/share/licenses/vulkan-loader/LICENSE
 }
diff --git a/mingw-w64-vulkan-loader/libvulkan-32.def b/mingw-w64-vulkan-loader/libvulkan-32.def
new file mode 100644
index 0000000000..356f1e20b5
--- /dev/null
+++ b/mingw-w64-vulkan-loader/libvulkan-32.def
@@ -0,0 +1,215 @@
+;
+; Definition file of vulkan-1.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008
+;
+LIBRARY "libvulkan-1.dll"
+EXPORTS
+vkAcquireNextImage2KHR@12
+vkAcquireNextImageKHR@40
+vkAllocateCommandBuffers@12
+vkAllocateDescriptorSets@12
+vkAllocateMemory@16
+vkBeginCommandBuffer@8
+vkBindBufferMemory2@12
+vkBindBufferMemory@28
+vkBindImageMemory2@12
+vkBindImageMemory@28
+vkCmdBeginQuery@20
+vkCmdBeginRenderPass2@12
+vkCmdBeginRenderPass@12
+vkCmdBindDescriptorSets@36
+vkCmdBindIndexBuffer@24
+vkCmdBindPipeline@16
+vkCmdBindVertexBuffers@20
+vkCmdBlitImage@40
+vkCmdClearAttachments@20
+vkCmdClearColorImage@28
+vkCmdClearDepthStencilImage@28
+vkCmdCopyBuffer@28
+vkCmdCopyBufferToImage@32
+vkCmdCopyImage@36
+vkCmdCopyImageToBuffer@32
+vkCmdCopyQueryPoolResults@48
+vkCmdDispatch@16
+vkCmdDispatchBase@28
+vkCmdDispatchIndirect@20
+vkCmdDraw@20
+vkCmdDrawIndexed@24
+vkCmdDrawIndexedIndirect@28
+vkCmdDrawIndexedIndirectCount@44
+vkCmdDrawIndirect@28
+vkCmdDrawIndirectCount@44
+vkCmdEndQuery@16
+vkCmdEndRenderPass2@8
+vkCmdEndRenderPass@4
+vkCmdExecuteCommands@12
+vkCmdFillBuffer@32
+vkCmdNextSubpass2@12
+vkCmdNextSubpass@8
+vkCmdPipelineBarrier@40
+vkCmdPushConstants@28
+vkCmdResetEvent@16
+vkCmdResetQueryPool@20
+vkCmdResolveImage@36
+vkCmdSetBlendConstants@8
+vkCmdSetDepthBias@16
+vkCmdSetDepthBounds@12
+vkCmdSetDeviceMask@8
+vkCmdSetEvent@16
+vkCmdSetLineWidth@8
+vkCmdSetScissor@16
+vkCmdSetStencilCompareMask@12
+vkCmdSetStencilReference@12
+vkCmdSetStencilWriteMask@12
+vkCmdSetViewport@16
+vkCmdUpdateBuffer@32
+vkCmdWaitEvents@44
+vkCmdWriteTimestamp@20
+vkCreateBuffer@16
+vkCreateBufferView@16
+vkCreateCommandPool@16
+vkCreateComputePipelines@28
+vkCreateDescriptorPool@16
+vkCreateDescriptorSetLayout@16
+vkCreateDescriptorUpdateTemplate@16
+vkCreateDevice@16
+vkCreateDisplayModeKHR@24
+vkCreateDisplayPlaneSurfaceKHR@16
+vkCreateEvent@16
+vkCreateFence@16
+vkCreateFramebuffer@16
+vkCreateGraphicsPipelines@28
+vkCreateImage@16
+vkCreateImageView@16
+vkCreateInstance@12
+vkCreatePipelineCache@16
+vkCreatePipelineLayout@16
+vkCreateQueryPool@16
+vkCreateRenderPass2@16
+vkCreateRenderPass@16
+vkCreateSampler@16
+vkCreateSamplerYcbcrConversion@16
+vkCreateSemaphore@16
+vkCreateShaderModule@16
+vkCreateSharedSwapchainsKHR@20
+vkCreateSwapchainKHR@16
+vkCreateWin32SurfaceKHR@16
+vkDestroyBuffer@16
+vkDestroyBufferView@16
+vkDestroyCommandPool@16
+vkDestroyDescriptorPool@16
+vkDestroyDescriptorSetLayout@16
+vkDestroyDescriptorUpdateTemplate@16
+vkDestroyDevice@8
+vkDestroyEvent@16
+vkDestroyFence@16
+vkDestroyFramebuffer@16
+vkDestroyImage@16
+vkDestroyImageView@16
+vkDestroyInstance@8
+vkDestroyPipeline@16
+vkDestroyPipelineCache@16
+vkDestroyPipelineLayout@16
+vkDestroyQueryPool@16
+vkDestroyRenderPass@16
+vkDestroySampler@16
+vkDestroySamplerYcbcrConversion@16
+vkDestroySemaphore@16
+vkDestroyShaderModule@16
+vkDestroySurfaceKHR@16
+vkDestroySwapchainKHR@16
+vkDeviceWaitIdle@4
+vkEndCommandBuffer@4
+vkEnumerateDeviceExtensionProperties@16
+vkEnumerateDeviceLayerProperties@12
+vkEnumerateInstanceExtensionProperties@12
+vkEnumerateInstanceLayerProperties@8
+vkEnumerateInstanceVersion@4
+vkEnumeratePhysicalDeviceGroups@12
+vkEnumeratePhysicalDevices@12
+vkFlushMappedMemoryRanges@12
+vkFreeCommandBuffers@20
+vkFreeDescriptorSets@20
+vkFreeMemory@16
+vkGetBufferDeviceAddress@8
+vkGetBufferMemoryRequirements2@12
+vkGetBufferMemoryRequirements@16
+vkGetBufferOpaqueCaptureAddress@8
+vkGetDescriptorSetLayoutSupport@12
+vkGetDeviceGroupPeerMemoryFeatures@20
+vkGetDeviceGroupPresentCapabilitiesKHR@8
+vkGetDeviceGroupSurfacePresentModesKHR@16
+vkGetDeviceMemoryCommitment@16
+vkGetDeviceMemoryOpaqueCaptureAddress@8
+vkGetDeviceProcAddr@8
+vkGetDeviceQueue2@12
+vkGetDeviceQueue@16
+vkGetDisplayModeProperties2KHR@20
+vkGetDisplayModePropertiesKHR@20
+vkGetDisplayPlaneCapabilities2KHR@12
+vkGetDisplayPlaneCapabilitiesKHR@20
+vkGetDisplayPlaneSupportedDisplaysKHR@16
+vkGetEventStatus@12
+vkGetFenceStatus@12
+vkGetImageMemoryRequirements2@12
+vkGetImageMemoryRequirements@16
+vkGetImageSparseMemoryRequirements2@16
+vkGetImageSparseMemoryRequirements@20
+vkGetImageSubresourceLayout@20
+vkGetInstanceProcAddr@8
+vkGetPhysicalDeviceDisplayPlaneProperties2KHR@12
+vkGetPhysicalDeviceDisplayPlanePropertiesKHR@12
+vkGetPhysicalDeviceDisplayProperties2KHR@12
+vkGetPhysicalDeviceDisplayPropertiesKHR@12
+vkGetPhysicalDeviceExternalBufferProperties@12
+vkGetPhysicalDeviceExternalFenceProperties@12
+vkGetPhysicalDeviceExternalSemaphoreProperties@12
+vkGetPhysicalDeviceFeatures2@8
+vkGetPhysicalDeviceFeatures@8
+vkGetPhysicalDeviceFormatProperties2@12
+vkGetPhysicalDeviceFormatProperties@12
+vkGetPhysicalDeviceImageFormatProperties2@12
+vkGetPhysicalDeviceImageFormatProperties@28
+vkGetPhysicalDeviceMemoryProperties2@8
+vkGetPhysicalDeviceMemoryProperties@8
+vkGetPhysicalDevicePresentRectanglesKHR@20
+vkGetPhysicalDeviceProperties2@8
+vkGetPhysicalDeviceProperties@8
+vkGetPhysicalDeviceQueueFamilyProperties2@12
+vkGetPhysicalDeviceQueueFamilyProperties@12
+vkGetPhysicalDeviceSparseImageFormatProperties2@16
+vkGetPhysicalDeviceSparseImageFormatProperties@32
+vkGetPhysicalDeviceSurfaceCapabilities2KHR@12
+vkGetPhysicalDeviceSurfaceCapabilitiesKHR@16
+vkGetPhysicalDeviceSurfaceFormats2KHR@16
+vkGetPhysicalDeviceSurfaceFormatsKHR@20
+vkGetPhysicalDeviceSurfacePresentModesKHR@20
+vkGetPhysicalDeviceSurfaceSupportKHR@20
+vkGetPhysicalDeviceWin32PresentationSupportKHR@8
+vkGetPipelineCacheData@20
+vkGetQueryPoolResults@40
+vkGetRenderAreaGranularity@16
+vkGetSemaphoreCounterValue@16
+vkGetSwapchainImagesKHR@20
+vkInvalidateMappedMemoryRanges@12
+vkMapMemory@36
+vkMergePipelineCaches@20
+vkQueueBindSparse@20
+vkQueuePresentKHR@8
+vkQueueSubmit@20
+vkQueueWaitIdle@4
+vkResetCommandBuffer@8
+vkResetCommandPool@16
+vkResetDescriptorPool@16
+vkResetEvent@12
+vkResetFences@12
+vkResetQueryPool@20
+vkSetEvent@12
+vkSignalSemaphore@8
+vkTrimCommandPool@16
+vkUnmapMemory@12
+vkUpdateDescriptorSetWithTemplate@24
+vkUpdateDescriptorSets@20
+vkWaitForFences@24
+vkWaitSemaphores@16