Handle vkGetPhysicalDeviceSurfaceFormats2KHR in the virtual swapchain.

google · Apr 20, 2022 · 17d4ffb · 17d4ffb
1 parent 09a6a36
commit 17d4ffb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/core/vulkan/vk_virtual_swapchain/cc/layer.cpp b/core/vulkan/vk_virtual_swapchain/cc/layer.cpp
@@ -516,6 +516,7 @@ vkGetInstanceProcAddr(VkInstance instance, const char* funcName) {
 
   INTERCEPT(vkGetPhysicalDeviceSurfaceSupportKHR);
   INTERCEPT(vkGetPhysicalDeviceSurfaceFormatsKHR);
+  INTERCEPT(vkGetPhysicalDeviceSurfaceFormats2KHR);
   INTERCEPT(vkGetPhysicalDeviceSurfaceCapabilitiesKHR);
   INTERCEPT(vkGetPhysicalDeviceSurfaceCapabilities2KHR);
   INTERCEPT(vkGetPhysicalDeviceSurfacePresentModesKHR);

diff --git a/core/vulkan/vk_virtual_swapchain/cc/swapchain.cpp b/core/vulkan/vk_virtual_swapchain/cc/swapchain.cpp
@@ -213,6 +213,15 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormatsKHR(
   return VK_SUCCESS;
 }
 
+VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormats2KHR(
+    VkPhysicalDevice physicalDevice,
+    const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
+    uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats) {
+  return swapchain::vkGetPhysicalDeviceSurfaceFormatsKHR(
+      physicalDevice, pSurfaceInfo->surface, pSurfaceFormatCount,
+      pSurfaceFormats);
+}
+
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(
     VkPhysicalDevice physicalDevice, VkSurfaceKHR surface,
     uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes) {

diff --git a/core/vulkan/vk_virtual_swapchain/cc/swapchain.h b/core/vulkan/vk_virtual_swapchain/cc/swapchain.h
@@ -55,6 +55,11 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormatsKHR(
     VkPhysicalDevice physicalDevice, VkSurfaceKHR surface,
     uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats);
 
+VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormats2KHR(
+    VkPhysicalDevice physicalDevice,
+    const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo,
+    uint32_t* pSurfaceFormatCount, VkSurfaceFormatKHR* pSurfaceFormats);
+
 VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfacePresentModesKHR(
     VkPhysicalDevice physicalDevice, VkSurfaceKHR surface,
     uint32_t* pPresentModeCount, VkPresentModeKHR* pPresentModes);
@@ -122,4 +127,4 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateRenderPass(
     VkDevice device, const VkRenderPassCreateInfo* pCreateInfo,
     const VkAllocationCallbacks* pAllocator, VkRenderPass* pRenderPass);
 }  // namespace swapchain
-#endif  // VK_VIRTUAL_SWAPCHAIN_SWAPCHAIN_H_
+#endif  // VK_VIRTUAL_SWAPCHAIN_SWAPCHAIN_H_