[PATCH 7/8] vulkan-1/tests: Add test for VK_KHR_device_group_creation.
Józef Kucia
jkucia at codeweavers.com
Thu Jul 12 04:39:45 CDT 2018
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/vulkan-1/tests/vulkan.c | 143 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 139 insertions(+), 4 deletions(-)
diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c
index 25e5c01343f6..087ee16b05df 100644
--- a/dlls/vulkan-1/tests/vulkan.c
+++ b/dlls/vulkan-1/tests/vulkan.c
@@ -25,6 +25,7 @@ static VkResult create_instance(uint32_t extension_count,
const char * const *enabled_extensions, VkInstance *vk_instance)
{
VkInstanceCreateInfo create_info;
+ VkResult vr;
create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO;
create_info.pNext = NULL;
@@ -35,7 +36,82 @@ static VkResult create_instance(uint32_t extension_count,
create_info.enabledExtensionCount = extension_count;
create_info.ppEnabledExtensionNames = enabled_extensions;
- return vkCreateInstance(&create_info, NULL, vk_instance);
+ if ((vr = vkCreateInstance(&create_info, NULL, vk_instance)) >= 0)
+ return vr;
+
+ switch (vr)
+ {
+ case VK_ERROR_EXTENSION_NOT_PRESENT:
+ if (extension_count == 1)
+ skip("Instance extension '%s' not supported.\n", enabled_extensions[0]);
+ else
+ skip("Instance extensions not supported.\n");
+ break;
+
+ default:
+ skip("Failed to create Vulkan instance, vr %d.\n", vr);
+ break;
+ }
+ return vr;
+}
+
+static VkBool32 find_queue_family(VkPhysicalDevice vk_physical_device,
+ VkQueueFlags flags, uint32_t *family_index)
+{
+ VkQueueFamilyProperties *properties;
+ VkBool32 ret = VK_FALSE;
+ uint32_t i, count;
+
+ vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, NULL);
+ properties = heap_calloc(count, sizeof(*properties));
+ ok(!!properties, "Failed to allocate memory.\n");
+ vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, properties);
+
+ for (i = 0; i < count; ++i)
+ {
+ if ((properties[i].queueFlags & flags) == flags)
+ {
+ ret = VK_TRUE;
+ *family_index = i;
+ break;
+ }
+ }
+
+ heap_free(properties);
+ return ret;
+}
+
+static VkResult create_device(VkPhysicalDevice vk_physical_device,
+ uint32_t extension_count, const char * const *enabled_extensions,
+ const void *next, VkDevice *vk_device)
+{
+ VkDeviceQueueCreateInfo queue_info;
+ VkDeviceCreateInfo create_info;
+ float priority = 0.0f;
+
+ queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
+ queue_info.pNext = NULL;
+ queue_info.flags = 0;
+ if (!find_queue_family(vk_physical_device, VK_QUEUE_GRAPHICS_BIT, &queue_info.queueFamilyIndex))
+ {
+ trace("Failed to find queue family.\n");
+ return VK_ERROR_INITIALIZATION_FAILED;
+ }
+ queue_info.queueCount = 1;
+ queue_info.pQueuePriorities = &priority;
+
+ create_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
+ create_info.pNext = next;
+ create_info.flags = 0;
+ create_info.queueCreateInfoCount = 1;
+ create_info.pQueueCreateInfos = &queue_info;
+ create_info.enabledLayerCount = 0;
+ create_info.ppEnabledLayerNames = NULL;
+ create_info.enabledExtensionCount = extension_count;
+ create_info.ppEnabledExtensionNames = enabled_extensions;
+ create_info.pEnabledFeatures = NULL;
+
+ return vkCreateDevice(vk_physical_device, &create_info, NULL, vk_device);
}
static void enumerate_physical_device(VkPhysicalDevice vk_physical_device)
@@ -52,6 +128,67 @@ static void enumerate_physical_device(VkPhysicalDevice vk_physical_device)
VK_VERSION_PATCH(properties.apiVersion));
}
+static void test_physical_device_groups(void)
+{
+ PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR;
+ VkPhysicalDeviceGroupProperties *properties;
+ VkDeviceGroupDeviceCreateInfo group_info;
+ VkInstance vk_instance;
+ uint32_t i, j, count;
+ VkDevice vk_device;
+ VkResult vr;
+
+ static const char *extensions[] =
+ {
+ VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME,
+ };
+
+ if ((vr = create_instance(ARRAY_SIZE(extensions), extensions, &vk_instance)) < 0)
+ return;
+ ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr);
+
+ vkEnumeratePhysicalDeviceGroupsKHR
+ = (void *)vkGetInstanceProcAddr(vk_instance, "vkEnumeratePhysicalDeviceGroupsKHR");
+ ok(!!vkEnumeratePhysicalDeviceGroupsKHR, "Failed to get proc addr.\n");
+
+ vr = vkEnumeratePhysicalDeviceGroupsKHR(vk_instance, &count, NULL);
+ ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr);
+ ok(count > 0, "Unexpected device group count %u.\n", count);
+
+ properties = heap_calloc(count, sizeof(*properties));
+ ok(!!properties, "Failed to allocate memory.\n");
+ vr = vkEnumeratePhysicalDeviceGroupsKHR(vk_instance, &count, properties);
+ ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr);
+
+ for (i = 0; i < count; ++i)
+ {
+ trace("Group[%u] count %u, subset allocation %#x\n",
+ i, properties[i].physicalDeviceCount, properties[i].subsetAllocation);
+ for (j = 0; j < properties[i].physicalDeviceCount; ++j)
+ enumerate_physical_device(properties[i].physicalDevices[j]);
+ }
+
+ if ((vr = create_device(properties->physicalDevices[0], 0, NULL, NULL, &vk_device)) < 0)
+ {
+ skip("Failed to create device, vr %d.\n", vr);
+ return;
+ }
+ ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr);
+ vkDestroyDevice(vk_device, NULL);
+
+ group_info.sType = VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO;
+ group_info.pNext = NULL;
+ group_info.physicalDeviceCount = properties->physicalDeviceCount;
+ group_info.pPhysicalDevices = properties->physicalDevices;
+ vr = create_device(group_info.pPhysicalDevices[0], 0, NULL, &group_info, &vk_device);
+ ok(vr == VK_SUCCESS, "Failed to create device, VkResult %d.\n", vr);
+ vkDestroyDevice(vk_device, NULL);
+
+ heap_free(properties);
+
+ vkDestroyInstance(vk_instance, NULL);
+}
+
static void for_each_device(void (*test_func)(VkPhysicalDevice))
{
VkPhysicalDevice *vk_physical_devices;
@@ -61,10 +198,7 @@ static void for_each_device(void (*test_func)(VkPhysicalDevice))
VkResult vr;
if ((vr = create_instance(0, NULL, &vk_instance)) < 0)
- {
- skip("Failed to create Vulkan instance, vr %d.\n", vr);
return;
- }
ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr);
vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL);
@@ -92,4 +226,5 @@ static void for_each_device(void (*test_func)(VkPhysicalDevice))
START_TEST(vulkan)
{
for_each_device(enumerate_physical_device);
+ test_physical_device_groups();
}
--
2.16.4
More information about the wine-devel
mailing list