@@ -110,6 +110,7 @@ class MockDevice final {
110110struct MockVulkanState {
111111 std::vector<std::string> instance_extensions;
112112 std::vector<std::string> instance_layers;
113+ std::vector<std::string> device_extensions;
113114 std::function<void (VkPhysicalDevice physicalDevice,
114115 VkFormat format,
115116 VkFormatProperties* pFormatProperties)>
@@ -165,32 +166,46 @@ VkResult vkEnumerateInstanceExtensionProperties(
165166 VkExtensionProperties* pProperties) {
166167 if (!pProperties) {
167168 *pPropertyCount = GetMockVulkanState ().instance_extensions .size ();
169+ return VK_SUCCESS ;
168170 } else {
169171 uint32_t count = 0 ;
172+ VkResult result = VK_SUCCESS ;
170173 for (const std::string& ext : GetMockVulkanState ().instance_extensions ) {
171- strncpy (pProperties[count].extensionName , ext.c_str (),
172- sizeof (VkExtensionProperties::extensionName));
174+ if (count >= *pPropertyCount) {
175+ result = VK_INCOMPLETE ;
176+ break ;
177+ }
178+ snprintf (pProperties[count].extensionName ,
179+ sizeof (pProperties[count].extensionName ), " %s" , ext.c_str ());
173180 pProperties[count].specVersion = 0 ;
174181 count++;
175182 }
183+ *pPropertyCount = count;
184+ return result;
176185 }
177- return VK_SUCCESS ;
178186}
179187
180188VkResult vkEnumerateInstanceLayerProperties (uint32_t * pPropertyCount,
181189 VkLayerProperties* pProperties) {
182190 if (!pProperties) {
183191 *pPropertyCount = GetMockVulkanState ().instance_layers .size ();
192+ return VK_SUCCESS ;
184193 } else {
185194 uint32_t count = 0 ;
186- for (const std::string& layer : GetMockVulkanState ().instance_layers ) {
187- strncpy (pProperties[count].layerName , layer.c_str (),
188- sizeof (VkLayerProperties::layerName));
195+ VkResult result = VK_SUCCESS ;
196+ for (const std::string& ext : GetMockVulkanState ().instance_layers ) {
197+ if (count >= *pPropertyCount) {
198+ result = VK_INCOMPLETE ;
199+ break ;
200+ }
201+ snprintf (pProperties[count].layerName ,
202+ sizeof (pProperties[count].layerName ), " %s" , ext.c_str ());
189203 pProperties[count].specVersion = 0 ;
190204 count++;
191205 }
206+ *pPropertyCount = count;
207+ return result;
192208 }
193- return VK_SUCCESS ;
194209}
195210
196211VkResult vkEnumeratePhysicalDevices (VkInstance instance,
@@ -246,12 +261,24 @@ VkResult vkEnumerateDeviceExtensionProperties(
246261 uint32_t * pPropertyCount,
247262 VkExtensionProperties* pProperties) {
248263 if (!pProperties) {
249- *pPropertyCount = 1 ;
264+ *pPropertyCount = GetMockVulkanState ().device_extensions .size ();
265+ return VK_SUCCESS ;
250266 } else {
251- strcpy (pProperties[0 ].extensionName , " VK_KHR_swapchain" );
252- pProperties[0 ].specVersion = 0 ;
267+ uint32_t count = 0 ;
268+ VkResult result = VK_SUCCESS ;
269+ for (const std::string& ext : GetMockVulkanState ().device_extensions ) {
270+ if (count >= *pPropertyCount) {
271+ result = VK_INCOMPLETE ;
272+ break ;
273+ }
274+ snprintf (pProperties[count].extensionName ,
275+ sizeof (pProperties[count].extensionName ), " %s" , ext.c_str ());
276+ pProperties[count].specVersion = 0 ;
277+ count++;
278+ }
279+ *pPropertyCount = count;
280+ return result;
253281 }
254- return VK_SUCCESS ;
255282}
256283
257284VkResult vkCreateDevice (VkPhysicalDevice physicalDevice,
@@ -1026,6 +1053,7 @@ PFN_vkVoidFunction GetMockVulkanProcAddress(VkInstance instance,
10261053
10271054MockVulkanContextBuilder::MockVulkanContextBuilder ()
10281055 : instance_extensions_({" VK_KHR_surface" , " VK_MVK_macos_surface" }),
1056+ device_extensions_ ({" VK_KHR_swapchain" }),
10291057 format_properties_callback_ ([](VkPhysicalDevice physicalDevice,
10301058 VkFormat format,
10311059 VkFormatProperties* pFormatProperties) {
@@ -1054,6 +1082,7 @@ std::shared_ptr<ContextVK> MockVulkanContextBuilder::Build() {
10541082 g_mock_vulkan_state.reset (new MockVulkanState ());
10551083 g_mock_vulkan_state->instance_extensions = instance_extensions_;
10561084 g_mock_vulkan_state->instance_layers = instance_layers_;
1085+ g_mock_vulkan_state->device_extensions = device_extensions_;
10571086 g_mock_vulkan_state->format_properties_callback = format_properties_callback_;
10581087 g_mock_vulkan_state->physical_device_properties_callback =
10591088 physical_properties_callback_;
0 commit comments