Skip to content

[vulkan] Use API version for extension detection #8896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
derek-gerstmann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[vulkan] Use API version for extension detection #8896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/runtime/vulkan_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,13 +327,23 @@ int vk_create_device(void *user_context, const StringTable &requested_layers, Vk
VkPhysicalDevice *physical_device, uint32_t *queue_family_index, const VkAllocationCallbacks *alloc_callbacks) {
debug(user_context) << " vk_create_device (user_context=" << user_context << ")\n";

// Get the API version to determine what device features are valid to search for
VkPhysicalDeviceProperties device_properties = {0};
debug(user_context) << " querying for device properties ...\n";
vkGetPhysicalDeviceProperties(*physical_device, &device_properties);
uint32_t major_version = VK_API_VERSION_MAJOR(device_properties.apiVersion);
uint32_t minor_version = VK_API_VERSION_MINOR(device_properties.apiVersion);
bool has_capability_v11 = (major_version >= 1) && (minor_version >= 1); // supports >= v1.1
bool has_capability_v12 = (major_version >= 1) && (minor_version >= 2); // supports >= v1.2
debug(user_context) << " found device compute capability v" << major_version << "." << minor_version << " ...\n";

debug(user_context) << " checking for required device extensions ...\n";
StringTable required_device_extensions;
vk_get_required_device_extensions(user_context, required_device_extensions);
vk_get_required_device_extensions(user_context, major_version, minor_version, required_device_extensions);

debug(user_context) << " checking for optional device extensions ...\n";
StringTable optional_device_extensions;
vk_get_optional_device_extensions(user_context, optional_device_extensions);
vk_get_optional_device_extensions(user_context, major_version, minor_version, optional_device_extensions);

debug(user_context) << " validating supported device extensions ...\n";
StringTable supported_device_extensions;
Expand Down Expand Up @@ -369,16 +379,6 @@ int vk_create_device(void *user_context, const StringTable &requested_layers, Vk
&queue_priority,
};

// Get the API version to determine what device features are valid to search for
VkPhysicalDeviceProperties device_properties = {0};
debug(user_context) << " querying for device properties ...\n";
vkGetPhysicalDeviceProperties(*physical_device, &device_properties);
uint32_t major_version = VK_API_VERSION_MAJOR(device_properties.apiVersion);
uint32_t minor_version = VK_API_VERSION_MINOR(device_properties.apiVersion);
bool has_capability_v11 = (major_version >= 1) && (minor_version >= 1); // supports >= v1.1
bool has_capability_v12 = (major_version >= 1) && (minor_version >= 2); // supports >= v1.2
debug(user_context) << " found device compute capability v" << major_version << "." << minor_version << " ...\n";

// Get the device features so that all supported features are enabled when device is created
VkPhysicalDeviceFeatures device_features = {};
void *extended_features_ptr = nullptr;
Expand Down
79 changes: 59 additions & 20 deletions src/runtime/vulkan_extensions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,14 +137,14 @@ uint32_t vk_get_requested_layers(void *user_context, StringTable &layer_table) {
}

uint32_t vk_get_required_instance_extensions(void *user_context, StringTable &ext_table) {
const char *required_ext_table[] = {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME};
const uint32_t required_ext_count = sizeof(required_ext_table) / sizeof(required_ext_table[0]);
ext_table.fill(user_context, (const char **)required_ext_table, required_ext_count);
return required_ext_count;
// Don't require any instance extensions (unless there are features we can't query for later ...)
return 0;
}

uint32_t vk_get_optional_instance_extensions(void *user_context, StringTable &ext_table) {
const char *optional_ext_table[] = {VK_EXT_DEBUG_UTILS_EXTENSION_NAME};
const char *optional_ext_table[] = {
VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, //< promoted to core in v1.1
VK_EXT_DEBUG_UTILS_EXTENSION_NAME}; //< optional on all versions
const uint32_t optional_ext_count = sizeof(optional_ext_table) / sizeof(optional_ext_table[0]);
ext_table.fill(user_context, (const char **)optional_ext_table, optional_ext_count);
return optional_ext_count;
Expand Down Expand Up @@ -191,24 +191,63 @@ uint32_t vk_get_supported_instance_extensions(void *user_context, StringTable &e
return avail_ext_count;
}

uint32_t vk_get_required_device_extensions(void *user_context, StringTable &ext_table) {
const char *required_ext_table[] = {
VK_KHR_8BIT_STORAGE_EXTENSION_NAME,
VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_EXTENSION_NAME};
const uint32_t required_ext_count = sizeof(required_ext_table) / sizeof(required_ext_table[0]);
ext_table.fill(user_context, (const char **)required_ext_table, required_ext_count);
uint32_t vk_get_required_device_extensions(void *user_context, uint32_t major_version, uint32_t minor_version, StringTable &ext_table) {
// Only require device extensions that have *not* been promoted to the current major, minor version
// supported by the Vulkan device (since the extension string may be missing once it has been promoted)
const char *before_v1p1_ext_table[] = {
VK_KHR_STORAGE_BUFFER_STORAGE_CLASS_EXTENSION_NAME}; // promoted to core in v1.1
const uint32_t before_v1p1_ext_count = sizeof(before_v1p1_ext_table) / sizeof(before_v1p1_ext_table[0]);

const char *before_v1p2_ext_table[] = {
before_v1p1_ext_table[0],
VK_KHR_8BIT_STORAGE_EXTENSION_NAME}; // promoted to core in v1.2
const uint32_t before_v1p2_ext_count = sizeof(before_v1p2_ext_table) / sizeof(before_v1p2_ext_table[0]);

uint32_t required_ext_count = 0;
if (major_version >= 1) {
if (minor_version < 1) {
ext_table.fill(user_context, (const char **)before_v1p1_ext_table, before_v1p1_ext_count);
required_ext_count = before_v1p1_ext_count;
} else if (minor_version < 2) {
ext_table.fill(user_context, (const char **)before_v1p2_ext_table, before_v1p2_ext_count);
required_ext_count = before_v1p2_ext_count;
}
}
return required_ext_count;
}

uint32_t vk_get_optional_device_extensions(void *user_context, StringTable &ext_table) {
const char *optional_ext_table[] = {
"VK_KHR_portability_subset", //< necessary for running under Molten (aka Vulkan on Mac)
VK_KHR_MAINTENANCE_5_EXTENSION_NAME,
VK_KHR_16BIT_STORAGE_EXTENSION_NAME,
VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME,
VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME};
const uint32_t optional_ext_count = sizeof(optional_ext_table) / sizeof(optional_ext_table[0]);
ext_table.fill(user_context, (const char **)optional_ext_table, optional_ext_count);
uint32_t vk_get_optional_device_extensions(void *user_context, uint32_t major_version, uint32_t minor_version, StringTable &ext_table) {
// Only add optional device extensions that have *not* been promoted to the current major, minor version
// supported by the Vulkan device (since the extension string may be missing once it has been promoted)
const char *before_v1p1_ext_table[] = {
VK_KHR_16BIT_STORAGE_EXTENSION_NAME}; //< promoted to core in v1.1
const uint32_t before_v1p1_ext_count = sizeof(before_v1p1_ext_table) / sizeof(before_v1p1_ext_table[0]);

const char *before_v1p2_ext_table[] = {
before_v1p1_ext_table[0],
"VK_KHR_portability_subset", //< requires v1.1, always optional, necessary for running under Molten (aka Vulkan on Mac)
VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME, //< promoted to core in v1.2
VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME}; //< promoted to core in v1.2
const uint32_t before_v1p2_ext_count = sizeof(before_v1p2_ext_table) / sizeof(before_v1p2_ext_table[0]);

const char *v1p3_ext_table[] = {
"VK_KHR_portability_subset", //< requires v1.1, always optional, necessary for running under Molten (aka Vulkan on Mac)
VK_KHR_MAINTENANCE_5_EXTENSION_NAME}; //< requires v1.3
const uint32_t v1p3_ext_count = sizeof(v1p3_ext_table) / sizeof(v1p3_ext_table[0]);

uint32_t optional_ext_count = 0;
if (major_version >= 1) {
if (minor_version < 1) {
ext_table.fill(user_context, (const char **)before_v1p1_ext_table, before_v1p1_ext_count);
optional_ext_count = before_v1p1_ext_count;
} else if (minor_version < 2) {
ext_table.fill(user_context, (const char **)before_v1p2_ext_table, before_v1p2_ext_count);
optional_ext_count = before_v1p2_ext_count;
} else if (minor_version >= 3) {
ext_table.fill(user_context, (const char **)v1p3_ext_table, v1p3_ext_count);
optional_ext_count = v1p3_ext_count;
}
}
return optional_ext_count;
}

Expand Down
5 changes: 3 additions & 2 deletions src/runtime/vulkan_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ int vk_create_device(void *user_context, const StringTable &requested_layers, Vk
// --------------------------------------------------------------------------
uint32_t vk_get_requested_layers(void *user_context, StringTable &layer_table);
uint32_t vk_get_required_instance_extensions(void *user_context, StringTable &ext_table);
uint32_t vk_get_optional_instance_extensions(void *user_context, StringTable &ext_table);
uint32_t vk_get_supported_instance_extensions(void *user_context, StringTable &ext_table);
uint32_t vk_get_required_device_extensions(void *user_context, StringTable &ext_table);
uint32_t vk_get_optional_device_extensions(void *user_context, StringTable &ext_table);
uint32_t vk_get_required_device_extensions(void *user_context, uint32_t major_version, uint32_t minor_version, StringTable &ext_table);
uint32_t vk_get_optional_device_extensions(void *user_context, uint32_t major_version, uint32_t minor_version, StringTable &ext_table);
uint32_t vk_get_supported_device_extensions(void *user_context, VkPhysicalDevice physical_device, StringTable &ext_table);
bool vk_validate_required_extension_support(void *user_context,
const StringTable &required_extensions,
Expand Down
Loading