Implement vkGetSwapchainImagesKHR

src/Vulkan/VkGetProcAddress.cpp

@@ -250,6 +250,7 @@ static const std::unordered_map<std::string, PFN_vkVoidFunction> deviceFunctionP
 	MAKE_VULKAN_DEVICE_ENTRY(vkGetDescriptorSetLayoutSupportKHR),
 	MAKE_VULKAN_DEVICE_ENTRY(vkCreateSwapchainKHR),
 	MAKE_VULKAN_DEVICE_ENTRY(vkDestroySwapchainKHR),
+	MAKE_VULKAN_DEVICE_ENTRY(vkGetSwapchainImagesKHR),
 };
 #undef MAKE_VULKAN_DEVICE_ENTRY
 

src/Vulkan/libVulkan.cpp

@@ -2168,10 +2168,24 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateSwapchainKHR(VkDevice device, const VkSwa
 
 VKAPI_ATTR void VKAPI_CALL vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks* pAllocator)
 {
-	TRACE("(VkDevice device, VkSwapchainKHR swapchain, const VkAllocationCallbacks* pAllocator)",
+	TRACE("(VkDevice device = 0x%X, VkSwapchainKHR swapchain = 0x%X, const VkAllocationCallbacks* pAllocator = 0x%X)",
 			device, swapchain, pAllocator);
 
 	vk::destroy(swapchain, pAllocator);
 }
 
+VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapchain, uint32_t* pSwapchainImageCount, VkImage* pSwapchainImages)
+{
+	TRACE("(VkDevice device = 0x%X, VkSwapchainKHR swapchain = 0x%X, uint32_t* pSwapchainImageCount = 0x%X, VkImage* pSwapchainImages = 0x%X)",
+			device, swapchain, pSwapchainImageCount, pSwapchainImages);
+
+	if(!pSwapchainImages)
+	{
+		*pSwapchainImageCount = vk::Cast(swapchain)->getImageCount();
+		return VK_SUCCESS;
+	}
+
+	return vk::Cast(swapchain)->getImages(pSwapchainImageCount, pSwapchainImages);
+}
+
 }

src/WSI/VkSwapchainKHR.cpp

@@ -18,12 +18,13 @@
 #include "Vulkan/VkDeviceMemory.hpp"
 #include "Vulkan/VkDestroy.h"
 
+#include <algorithm>
+
 namespace vk
 {
 
 SwapchainKHR::SwapchainKHR(const VkSwapchainCreateInfoKHR *pCreateInfo, void *mem) :
-	createInfo(*pCreateInfo),
-	imageCount(0)
+	createInfo(*pCreateInfo)
 {
 	images.resize(pCreateInfo->minImageCount);
 	resetImages();
@@ -120,4 +121,29 @@ VkResult SwapchainKHR::createImages(VkDevice device)
 	return VK_SUCCESS;
 }
 
+uint32_t SwapchainKHR::getImageCount() const
+{
+	return static_cast<uint32_t >(images.size());
+}
+
+VkResult SwapchainKHR::getImages(uint32_t *pSwapchainImageCount, VkImage *pSwapchainImages) const
+{
+	uint32_t count = getImageCount();
+
+	uint32_t i;
+	for (i = 0; i < std::min(*pSwapchainImageCount, count); i++)
+	{
+		pSwapchainImages[i] = images[i].image;
+	}
+
+	*pSwapchainImageCount = i;
+
+	if (*pSwapchainImageCount < count)
+	{
+		return VK_INCOMPLETE;
+	}
+
+	return VK_SUCCESS;
+}
+
 }
\ No newline at end of file

src/WSI/VkSwapchainKHR.hpp

@@ -15,7 +15,9 @@
 #ifndef SWIFTSHADER_VKSWAPCHAINKHR_HPP
 #define SWIFTSHADER_VKSWAPCHAINKHR_HPP
 
+
 #include "Vulkan/VkObject.hpp"
+#include "Vulkan/VkImage.hpp"
 
 #include <vector>
 
@@ -49,10 +51,12 @@ public:
 
 	VkResult createImages(VkDevice device);
 
+	uint32_t getImageCount() const;
+	VkResult getImages(uint32_t *pSwapchainImageCount, VkImage *pSwapchainImages) const;
+
 private:
 	VkSwapchainCreateInfoKHR createInfo;
 	std::vector<PresentImage> images;
-	uint32_t imageCount;
 
 	void resetImages();
 };