Add support for vkAcquireNextImage2KHR

Previous versions of dEQP never called this function. Test: dEQP-VK.wsi.*.swapchain.render.* Test: dEQP-VK.api.version_check.entry_points Change-Id: I3d64403984ff60fea9ef2921f7f53f0ca4b94240 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/35928Tested-by: Chris Forbes <chrisforbes@google.com> Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com>

Add support for vkAcquireNextImage2KHR
25c8e080 · Chris Forbes · 5b57ff4d · 25c8e080 · 25c8e080
Commit 25c8e080 authored Sep 02, 2019 by Chris Forbes
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

VkGetProcAddress.cpp src/Vulkan/VkGetProcAddress.cpp +1 -0

libVulkan.cpp src/Vulkan/libVulkan.cpp +8 -0

No files found.
--- a/src/Vulkan/VkGetProcAddress.cpp
+++ b/src/Vulkan/VkGetProcAddress.cpp
@@ -327,6 +327,7 @@ static const std::vector<std::pair<const char*, std::unordered_map<std::string, 
 			MAKE_VULKAN_DEVICE_ENTRY(vkDestroySwapchainKHR),
 			MAKE_VULKAN_DEVICE_ENTRY(vkGetSwapchainImagesKHR),
 			MAKE_VULKAN_DEVICE_ENTRY(vkAcquireNextImageKHR),
+			MAKE_VULKAN_DEVICE_ENTRY(vkAcquireNextImage2KHR),
 			MAKE_VULKAN_DEVICE_ENTRY(vkQueuePresentKHR),
 			MAKE_VULKAN_DEVICE_ENTRY(vkGetDeviceGroupPresentCapabilitiesKHR),
 			MAKE_VULKAN_DEVICE_ENTRY(vkGetDeviceGroupSurfacePresentModesKHR),

--- a/src/Vulkan/libVulkan.cpp
+++ b/src/Vulkan/libVulkan.cpp
@@ -2851,6 +2851,14 @@ VKAPI_ATTR VkResult VKAPI_CALL vkQueuePresentKHR(VkQueue queue, const VkPresentI
 	return VK_SUCCESS;
 }
+VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImage2KHR(VkDevice device, const VkAcquireNextImageInfoKHR *pAcquireInfo, uint32_t *pImageIndex)
+{
+	TRACE("(VkDevice device = %p, const VkAcquireNextImageInfoKHR *pAcquireInfo = %p, uint32_t *pImageIndex = %p",
+			device, pAcquireInfo, pImageIndex);
+	return vk::Cast(pAcquireInfo->swapchain)->getNextImage(pAcquireInfo->timeout, vk::Cast(pAcquireInfo->semaphore), vk::Cast(pAcquireInfo->fence), pImageIndex);
+}
 VKAPI_ATTR VkResult VKAPI_CALL vkGetDeviceGroupPresentCapabilitiesKHR(VkDevice device, VkDeviceGroupPresentCapabilitiesKHR *pDeviceGroupPresentCapabilities)
 {
 	TRACE("(VkDevice device = %p, VkDeviceGroupPresentCapabilitiesKHR* pDeviceGroupPresentCapabilities = %p)",