diff options
Diffstat (limited to 'vulkan/vkjson/vkjson_instance.cc')
| -rw-r--r-- | vulkan/vkjson/vkjson_instance.cc | 451 |
1 files changed, 257 insertions, 194 deletions
diff --git a/vulkan/vkjson/vkjson_instance.cc b/vulkan/vkjson/vkjson_instance.cc index 587249539f..84cfe5e00b 100644 --- a/vulkan/vkjson/vkjson_instance.cc +++ b/vulkan/vkjson/vkjson_instance.cc @@ -28,6 +28,8 @@ #include <utility> namespace { +const char* kSupportedInstanceExtensions[] = { + "VK_KHR_get_physical_device_properties2"}; bool EnumerateExtensions(const char* layer_name, std::vector<VkExtensionProperties>* extensions) { @@ -45,6 +47,15 @@ bool EnumerateExtensions(const char* layer_name, } bool HasExtension(const char* extension_name, + uint32_t count, + const char* const* extensions) { + return std::find_if(extensions, extensions + count, + [extension_name](const char* extension) { + return strcmp(extension, extension_name) == 0; + }) != extensions + count; +} + +bool HasExtension(const char* extension_name, const std::vector<VkExtensionProperties>& extensions) { return std::find_if(extensions.cbegin(), extensions.cend(), [extension_name](const VkExtensionProperties& extension) { @@ -54,9 +65,27 @@ bool HasExtension(const char* extension_name, } } // anonymous namespace -VkJsonDevice VkJsonGetDevice(VkPhysicalDevice physical_device) { +VkJsonDevice VkJsonGetDevice(VkInstance instance, + VkPhysicalDevice physical_device, + uint32_t instance_extension_count, + const char* const* instance_extensions) { VkJsonDevice device; + PFN_vkGetPhysicalDeviceProperties2KHR vkpGetPhysicalDeviceProperties2KHR = + nullptr; + PFN_vkGetPhysicalDeviceFeatures2KHR vkpGetPhysicalDeviceFeatures2KHR = + nullptr; + if (instance != VK_NULL_HANDLE && + HasExtension("VK_KHR_get_physical_device_properties2", + instance_extension_count, instance_extensions)) { + vkpGetPhysicalDeviceProperties2KHR = + reinterpret_cast<PFN_vkGetPhysicalDeviceProperties2KHR>( + vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceProperties2KHR")); + vkpGetPhysicalDeviceFeatures2KHR = + reinterpret_cast<PFN_vkGetPhysicalDeviceFeatures2KHR>( + vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceFeatures2KHR")); + } + uint32_t extension_count = 0; vkEnumerateDeviceExtensionProperties(physical_device, nullptr, &extension_count, nullptr); @@ -74,48 +103,55 @@ VkJsonDevice VkJsonGetDevice(VkPhysicalDevice physical_device) { device.layers.data()); } - VkPhysicalDeviceProperties2 properties = { - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2, - nullptr, - {}, - }; - if (HasExtension("VK_KHR_driver_properties", device.extensions)) { - device.ext_driver_properties.reported = true; - device.ext_driver_properties.driver_properties_khr.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; - device.ext_driver_properties.driver_properties_khr.pNext = properties.pNext; - properties.pNext = &device.ext_driver_properties.driver_properties_khr; - } - vkGetPhysicalDeviceProperties2(physical_device, &properties); - device.properties = properties.properties; + if (HasExtension("VK_KHR_get_physical_device_properties2", + instance_extension_count, instance_extensions)) { + VkPhysicalDeviceProperties2KHR properties = { + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHR, + nullptr, + {} // properties + }; + if (HasExtension("VK_KHR_driver_properties", device.extensions)) { + device.ext_driver_properties.reported = true; + device.ext_driver_properties.driver_properties_khr.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR; + device.ext_driver_properties.driver_properties_khr.pNext = + properties.pNext; + properties.pNext = + &device.ext_driver_properties.driver_properties_khr; + } + vkpGetPhysicalDeviceProperties2KHR(physical_device, &properties); + device.properties = properties.properties; - VkPhysicalDeviceFeatures2 features = { - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2, - nullptr, - {}, - }; - if (HasExtension("VK_KHR_variable_pointers", device.extensions)) { - device.ext_variable_pointer_features.reported = true; - device.ext_variable_pointer_features.variable_pointer_features_khr.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR; - device.ext_variable_pointer_features.variable_pointer_features_khr.pNext = - features.pNext; - features.pNext = - &device.ext_variable_pointer_features.variable_pointer_features_khr; - } - if (HasExtension("VK_KHR_shader_float16_int8", device.extensions)) { - device.ext_shader_float16_int8_features.reported = true; - device.ext_shader_float16_int8_features.shader_float16_int8_features_khr - .sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES_KHR; - device.ext_shader_float16_int8_features.shader_float16_int8_features_khr - .pNext = features.pNext; - features.pNext = &device.ext_shader_float16_int8_features - .shader_float16_int8_features_khr; + VkPhysicalDeviceFeatures2KHR features = { + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR, + nullptr, + {} // features + }; + if (HasExtension("VK_KHR_variable_pointers", device.extensions)) { + device.ext_variable_pointer_features.reported = true; + device.ext_variable_pointer_features.variable_pointer_features_khr.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES_KHR; + device.ext_variable_pointer_features.variable_pointer_features_khr.pNext = + features.pNext; + features.pNext = + &device.ext_variable_pointer_features.variable_pointer_features_khr; + } + if (HasExtension("VK_KHR_shader_float16_int8", device.extensions)) { + device.ext_shader_float16_int8_features.reported = true; + device.ext_shader_float16_int8_features.shader_float16_int8_features_khr + .sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES_KHR; + device.ext_shader_float16_int8_features.shader_float16_int8_features_khr + .pNext = features.pNext; + features.pNext = &device.ext_shader_float16_int8_features + .shader_float16_int8_features_khr; + } + vkpGetPhysicalDeviceFeatures2KHR(physical_device, &features); + device.features = features.features; + } else { + vkGetPhysicalDeviceProperties(physical_device, &device.properties); + vkGetPhysicalDeviceFeatures(physical_device, &device.features); } - vkGetPhysicalDeviceFeatures2(physical_device, &features); - device.features = features.features; - vkGetPhysicalDeviceMemoryProperties(physical_device, &device.memory); uint32_t queue_family_count = 0; @@ -129,9 +165,7 @@ VkJsonDevice VkJsonGetDevice(VkPhysicalDevice physical_device) { VkFormatProperties format_properties = {}; for (VkFormat format = VK_FORMAT_R4G4_UNORM_PACK8; - // TODO(http://b/171403054): avoid hard-coding last value in the - // contiguous range - format <= VK_FORMAT_ASTC_12x12_SRGB_BLOCK; + format <= VK_FORMAT_END_RANGE; format = static_cast<VkFormat>(format + 1)) { vkGetPhysicalDeviceFormatProperties(physical_device, format, &format_properties); @@ -144,8 +178,6 @@ VkJsonDevice VkJsonGetDevice(VkPhysicalDevice physical_device) { if (device.properties.apiVersion >= VK_API_VERSION_1_1) { for (VkFormat format = VK_FORMAT_G8B8G8R8_422_UNORM; - // TODO(http://b/171403054): avoid hard-coding last value in the - // contiguous range format <= VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM; format = static_cast<VkFormat>(format + 1)) { vkGetPhysicalDeviceFormatProperties(physical_device, format, @@ -157,117 +189,135 @@ VkJsonDevice VkJsonGetDevice(VkPhysicalDevice physical_device) { } } - VkPhysicalDeviceProperties2 properties2 = { - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2, - nullptr, - {}, - }; - - device.subgroup_properties.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES; - device.subgroup_properties.pNext = properties2.pNext; - properties2.pNext = &device.subgroup_properties; - - device.point_clipping_properties.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES; - device.point_clipping_properties.pNext = properties2.pNext; - properties2.pNext = &device.point_clipping_properties; - - device.multiview_properties.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES; - device.multiview_properties.pNext = properties2.pNext; - properties2.pNext = &device.multiview_properties; - - device.id_properties.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; - device.id_properties.pNext = properties2.pNext; - properties2.pNext = &device.id_properties; - - device.maintenance3_properties.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES; - device.maintenance3_properties.pNext = properties2.pNext; - properties2.pNext = &device.maintenance3_properties; - - vkGetPhysicalDeviceProperties2(physical_device, &properties2); + PFN_vkGetPhysicalDeviceProperties2 vkpGetPhysicalDeviceProperties2 = + reinterpret_cast<PFN_vkGetPhysicalDeviceProperties2>( + vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceProperties2")); + if (vkpGetPhysicalDeviceProperties2) { + VkPhysicalDeviceProperties2 properties2 = { + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2, nullptr, {}}; + + device.subgroup_properties.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES; + device.subgroup_properties.pNext = properties2.pNext; + properties2.pNext = &device.subgroup_properties; + + device.point_clipping_properties.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_POINT_CLIPPING_PROPERTIES; + device.point_clipping_properties.pNext = properties2.pNext; + properties2.pNext = &device.point_clipping_properties; + + device.multiview_properties.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES; + device.multiview_properties.pNext = properties2.pNext; + properties2.pNext = &device.multiview_properties; + + device.id_properties.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + device.id_properties.pNext = properties2.pNext; + properties2.pNext = &device.id_properties; + + device.maintenance3_properties.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_3_PROPERTIES; + device.maintenance3_properties.pNext = properties2.pNext; + properties2.pNext = &device.maintenance3_properties; + + (*vkpGetPhysicalDeviceProperties2)(physical_device, &properties2); + } - VkPhysicalDeviceFeatures2 features2 = { - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2, - nullptr, - {}, - }; + PFN_vkGetPhysicalDeviceFeatures2 vkpGetPhysicalDeviceFeatures2 = + reinterpret_cast<PFN_vkGetPhysicalDeviceFeatures2>( + vkGetInstanceProcAddr(instance, "vkGetPhysicalDeviceFeatures2")); + if (vkpGetPhysicalDeviceFeatures2) { + VkPhysicalDeviceFeatures2 features2 = { + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2, nullptr, {}}; + + device.bit16_storage_features.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES; + device.bit16_storage_features.pNext = features2.pNext; + features2.pNext = &device.bit16_storage_features; + + device.multiview_features.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES; + device.multiview_features.pNext = features2.pNext; + features2.pNext = &device.multiview_features; + + device.variable_pointer_features.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES; + device.variable_pointer_features.pNext = features2.pNext; + features2.pNext = &device.variable_pointer_features; + + device.protected_memory_features.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES; + device.protected_memory_features.pNext = features2.pNext; + features2.pNext = &device.protected_memory_features; + + device.sampler_ycbcr_conversion_features.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES; + device.sampler_ycbcr_conversion_features.pNext = features2.pNext; + features2.pNext = &device.sampler_ycbcr_conversion_features; + + device.shader_draw_parameter_features.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES; + device.shader_draw_parameter_features.pNext = features2.pNext; + features2.pNext = &device.shader_draw_parameter_features; + + (*vkpGetPhysicalDeviceFeatures2)(physical_device, &features2); + } - device.bit16_storage_features.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES; - device.bit16_storage_features.pNext = features2.pNext; - features2.pNext = &device.bit16_storage_features; - - device.multiview_features.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES; - device.multiview_features.pNext = features2.pNext; - features2.pNext = &device.multiview_features; - - device.variable_pointer_features.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTER_FEATURES; - device.variable_pointer_features.pNext = features2.pNext; - features2.pNext = &device.variable_pointer_features; - - device.protected_memory_features.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES; - device.protected_memory_features.pNext = features2.pNext; - features2.pNext = &device.protected_memory_features; - - device.sampler_ycbcr_conversion_features.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES; - device.sampler_ycbcr_conversion_features.pNext = features2.pNext; - features2.pNext = &device.sampler_ycbcr_conversion_features; - - device.shader_draw_parameter_features.sType = - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETER_FEATURES; - device.shader_draw_parameter_features.pNext = features2.pNext; - features2.pNext = &device.shader_draw_parameter_features; - - vkGetPhysicalDeviceFeatures2(physical_device, &features2); - - VkPhysicalDeviceExternalFenceInfo external_fence_info = { - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO, nullptr, - VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT}; - VkExternalFenceProperties external_fence_properties = {}; - - for (VkExternalFenceHandleTypeFlagBits handle_type = - VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT; - handle_type <= VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT; - handle_type = - static_cast<VkExternalFenceHandleTypeFlagBits>(handle_type << 1)) { - external_fence_info.handleType = handle_type; - vkGetPhysicalDeviceExternalFenceProperties( - physical_device, &external_fence_info, &external_fence_properties); - if (external_fence_properties.exportFromImportedHandleTypes || - external_fence_properties.compatibleHandleTypes || - external_fence_properties.externalFenceFeatures) { - device.external_fence_properties.insert( - std::make_pair(handle_type, external_fence_properties)); + PFN_vkGetPhysicalDeviceExternalFenceProperties + vkpGetPhysicalDeviceExternalFenceProperties = + reinterpret_cast<PFN_vkGetPhysicalDeviceExternalFenceProperties>( + vkGetInstanceProcAddr( + instance, "vkGetPhysicalDeviceExternalFenceProperties")); + if (vkpGetPhysicalDeviceExternalFenceProperties) { + VkPhysicalDeviceExternalFenceInfo external_fence_info = { + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_FENCE_INFO, nullptr, + VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT}; + VkExternalFenceProperties external_fence_properties = {}; + + for (VkExternalFenceHandleTypeFlagBits handle_type = + VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT; + handle_type <= VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT; + handle_type = static_cast<VkExternalFenceHandleTypeFlagBits>( + handle_type << 1)) { + external_fence_info.handleType = handle_type; + (*vkpGetPhysicalDeviceExternalFenceProperties)( + physical_device, &external_fence_info, &external_fence_properties); + if (external_fence_properties.exportFromImportedHandleTypes || + external_fence_properties.compatibleHandleTypes || + external_fence_properties.externalFenceFeatures) { + device.external_fence_properties.insert( + std::make_pair(handle_type, external_fence_properties)); + } } } - VkPhysicalDeviceExternalSemaphoreInfo external_semaphore_info = { - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO, nullptr, - VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT}; - VkExternalSemaphoreProperties external_semaphore_properties = {}; - - for (VkExternalSemaphoreHandleTypeFlagBits handle_type = - VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; - handle_type <= VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT; - handle_type = static_cast<VkExternalSemaphoreHandleTypeFlagBits>( - handle_type << 1)) { - external_semaphore_info.handleType = handle_type; - vkGetPhysicalDeviceExternalSemaphoreProperties( - physical_device, &external_semaphore_info, - &external_semaphore_properties); - if (external_semaphore_properties.exportFromImportedHandleTypes || - external_semaphore_properties.compatibleHandleTypes || - external_semaphore_properties.externalSemaphoreFeatures) { - device.external_semaphore_properties.insert( - std::make_pair(handle_type, external_semaphore_properties)); + PFN_vkGetPhysicalDeviceExternalSemaphoreProperties + vkpGetPhysicalDeviceExternalSemaphoreProperties = reinterpret_cast< + PFN_vkGetPhysicalDeviceExternalSemaphoreProperties>( + vkGetInstanceProcAddr( + instance, "vkGetPhysicalDeviceExternalSemaphoreProperties")); + if (vkpGetPhysicalDeviceExternalSemaphoreProperties) { + VkPhysicalDeviceExternalSemaphoreInfo external_semaphore_info = { + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_SEMAPHORE_INFO, nullptr, + VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT}; + VkExternalSemaphoreProperties external_semaphore_properties = {}; + + for (VkExternalSemaphoreHandleTypeFlagBits handle_type = + VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; + handle_type <= VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT; + handle_type = static_cast<VkExternalSemaphoreHandleTypeFlagBits>( + handle_type << 1)) { + external_semaphore_info.handleType = handle_type; + (*vkpGetPhysicalDeviceExternalSemaphoreProperties)( + physical_device, &external_semaphore_info, + &external_semaphore_properties); + if (external_semaphore_properties.exportFromImportedHandleTypes || + external_semaphore_properties.compatibleHandleTypes || + external_semaphore_properties.externalSemaphoreFeatures) { + device.external_semaphore_properties.insert( + std::make_pair(handle_type, external_semaphore_properties)); + } } } } @@ -301,15 +351,19 @@ VkJsonInstance VkJsonGetInstance() { if (!EnumerateExtensions(nullptr, &instance.extensions)) return VkJsonInstance(); - const VkApplicationInfo app_info = { - VK_STRUCTURE_TYPE_APPLICATION_INFO, - nullptr, - "vkjson_info", - 1, - "", - 0, - VK_API_VERSION_1_1, - }; + std::vector<const char*> instance_extensions; + for (const auto extension : kSupportedInstanceExtensions) { + if (HasExtension(extension, instance.extensions)) + instance_extensions.push_back(extension); + } + + const VkApplicationInfo app_info = {VK_STRUCTURE_TYPE_APPLICATION_INFO, + nullptr, + "vkjson_info", + 1, + "", + 0, + VK_API_VERSION_1_1}; VkInstanceCreateInfo instance_info = { VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, nullptr, @@ -317,9 +371,8 @@ VkJsonInstance VkJsonGetInstance() { &app_info, 0, nullptr, - 0, - nullptr, - }; + static_cast<uint32_t>(instance_extensions.size()), + instance_extensions.data()}; VkInstance vkinstance; result = vkCreateInstance(&instance_info, nullptr, &vkinstance); if (result != VK_SUCCESS) @@ -344,42 +397,52 @@ VkJsonInstance VkJsonGetInstance() { instance.devices.reserve(sz); for (uint32_t i = 0; i < sz; ++i) { device_map.insert(std::make_pair(devices[i], i)); - instance.devices.emplace_back(VkJsonGetDevice(devices[i])); + instance.devices.emplace_back(VkJsonGetDevice(vkinstance, devices[i], + instance_extensions.size(), + instance_extensions.data())); } - result = vkEnumerateInstanceVersion(&instance.api_version); - if (result != VK_SUCCESS) { - vkDestroyInstance(vkinstance, nullptr); - return VkJsonInstance(); + PFN_vkEnumerateInstanceVersion vkpEnumerateInstanceVersion = + reinterpret_cast<PFN_vkEnumerateInstanceVersion>( + vkGetInstanceProcAddr(nullptr, "vkEnumerateInstanceVersion")); + if (!vkpEnumerateInstanceVersion) { + instance.api_version = VK_API_VERSION_1_0; + } else { + result = (*vkpEnumerateInstanceVersion)(&instance.api_version); + if (result != VK_SUCCESS) { + vkDestroyInstance(vkinstance, nullptr); + return VkJsonInstance(); + } } - count = 0; - result = vkEnumeratePhysicalDeviceGroups(vkinstance, &count, nullptr); - if (result != VK_SUCCESS) { - vkDestroyInstance(vkinstance, nullptr); - return VkJsonInstance(); - } + PFN_vkEnumeratePhysicalDeviceGroups vkpEnumeratePhysicalDeviceGroups = + reinterpret_cast<PFN_vkEnumeratePhysicalDeviceGroups>( + vkGetInstanceProcAddr(vkinstance, "vkEnumeratePhysicalDeviceGroups")); + if (vkpEnumeratePhysicalDeviceGroups) { + count = 0; + result = (*vkpEnumeratePhysicalDeviceGroups)(vkinstance, &count, nullptr); + if (result != VK_SUCCESS) { + vkDestroyInstance(vkinstance, nullptr); + return VkJsonInstance(); + } - VkJsonDeviceGroup device_group; - std::vector<VkPhysicalDeviceGroupProperties> group_properties; - group_properties.resize(count); - for (auto& properties : group_properties) { - properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GROUP_PROPERTIES; - properties.pNext = nullptr; - } - result = vkEnumeratePhysicalDeviceGroups(vkinstance, &count, - group_properties.data()); - if (result != VK_SUCCESS) { - vkDestroyInstance(vkinstance, nullptr); - return VkJsonInstance(); - } - for (auto properties : group_properties) { - device_group.properties = properties; - for (uint32_t i = 0; i < properties.physicalDeviceCount; ++i) { - device_group.device_inds.push_back( - device_map[properties.physicalDevices[i]]); + VkJsonDeviceGroup device_group; + std::vector<VkPhysicalDeviceGroupProperties> group_properties; + group_properties.resize(count); + result = (*vkpEnumeratePhysicalDeviceGroups)(vkinstance, &count, + group_properties.data()); + if (result != VK_SUCCESS) { + vkDestroyInstance(vkinstance, nullptr); + return VkJsonInstance(); + } + for (auto properties : group_properties) { + device_group.properties = properties; + for (uint32_t i = 0; i < properties.physicalDeviceCount; ++i) { + device_group.device_inds.push_back( + device_map[properties.physicalDevices[i]]); + } + instance.device_groups.push_back(device_group); } - instance.device_groups.push_back(device_group); } vkDestroyInstance(vkinstance, nullptr); |