diff options
| author | Petr Kraus <petr_kraus@email.cz> | 2020-04-08 20:57:14 +0200 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2020-04-09 14:03:10 -0600 |
| commit | 00573263e0ab14f7e3409dbaf55485534f8db057 (patch) | |
| tree | 53f022a93fdee61053400fdae4872df15a28e8e7 /scripts | |
| parent | c4a09f6680014180d6ce6c02d329d1a8cf6f0235 (diff) | |
| download | usermoji-00573263e0ab14f7e3409dbaf55485534f8db057.tar.xz | |
icd: Fix vkGetSwapchainImages behavior
- add missing lock
- return correct values via return and count
- bump to two images
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mock_icd_generator.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/scripts/mock_icd_generator.py b/scripts/mock_icd_generator.py index e68e2c7e..6b6a7bac 100644 --- a/scripts/mock_icd_generator.py +++ b/scripts/mock_icd_generator.py @@ -874,13 +874,19 @@ CUSTOM_C_INTERCEPTS = { *pLayout = VkSubresourceLayout(); // Default constructor zero values. ''', 'vkGetSwapchainImagesKHR': ''' + constexpr uint32_t icd_image_count = 2; + if (!pSwapchainImages) { - *pSwapchainImageCount = 1; - } else if (*pSwapchainImageCount > 0) { - pSwapchainImages[0] = (VkImage)global_unique_handle++; - if (*pSwapchainImageCount != 1) { - return VK_INCOMPLETE; + *pSwapchainImageCount = icd_image_count; + } else { + unique_lock_t lock(global_lock); + for (uint32_t img_i = 0; img_i < (std::min)(*pSwapchainImageCount, icd_image_count); ++img_i){ + // For simplicity always returns new handles, which is wrong + pSwapchainImages[img_i] = (VkImage)global_unique_handle++; } + + if (*pSwapchainImageCount < icd_image_count) return VK_INCOMPLETE; + else if (*pSwapchainImageCount > icd_image_count) *pSwapchainImageCount = icd_image_count; } return VK_SUCCESS; ''', @@ -1068,6 +1074,7 @@ class MockICDOutputGenerator(OutputGenerator): else: write('#include "mock_icd.h"', file=self.outFile) write('#include <stdlib.h>', file=self.outFile) + write('#include <algorithm>', file=self.outFile) write('#include <vector>', file=self.outFile) write('#include "vk_typemap_helper.h"', file=self.outFile) |