Skip to content
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

Only call surface creation functions on supported drivers #1581

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Only call surface creation functions on supported drivers #1581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
57f66ce
Refactor instance extension checks into single function
charles-lunarg Oct 23, 2024
0a8fa90
Only call surface creation functions on supported drivers
charles-lunarg Oct 23, 2024
d79f318
Fix wrong extension in log message
charles-lunarg Oct 29, 2024
b3b62dc
Small refactor of codegen
charles-lunarg Oct 29, 2024
d34e392
Track the extension used to create each VkSurfaceKHR
charles-lunarg Oct 29, 2024
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
10 changes: 0 additions & 10 deletions loader/debug_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,16 +612,6 @@ VkResult add_debug_extensions_to_ext_list(const struct loader_instance *inst, st
debug_utils_extension_info);
}

void check_for_enabled_debug_extensions(struct loader_instance *ptr_instance, const VkInstanceCreateInfo *pCreateInfo) {
for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_DEBUG_REPORT_EXTENSION_NAME) == 0) {
ptr_instance->enabled_known_extensions.ext_debug_report = 1;
} else if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_DEBUG_UTILS_EXTENSION_NAME) == 0) {
ptr_instance->enabled_known_extensions.ext_debug_utils = 1;
}
}
}

bool debug_extensions_InstanceGpa(struct loader_instance *ptr_instance, const char *name, void **addr) {
bool ret_type = false;

Expand Down
193 changes: 143 additions & 50 deletions loader/generated/vk_loader_extensions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12169,58 +12169,148 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na
return false;
}

// A function that can be used to query enabled extensions during a vkCreateInstance call
void extensions_create_instance(struct loader_instance *ptr_instance, const VkInstanceCreateInfo *pCreateInfo) {
for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) {

// ---- VK_KHR_get_physical_device_properties2 extension commands
if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.khr_get_physical_device_properties2 = 1;

// ---- VK_KHR_device_group_creation extension commands
} else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.khr_device_group_creation = 1;

// ---- VK_KHR_external_memory_capabilities extension commands
} else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.khr_external_memory_capabilities = 1;

// ---- VK_KHR_external_semaphore_capabilities extension commands
} else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.khr_external_semaphore_capabilities = 1;

// ---- VK_KHR_external_fence_capabilities extension commands
} else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.khr_external_fence_capabilities = 1;

// ---- VK_NV_external_memory_capabilities extension commands
} else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_NV_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.nv_external_memory_capabilities = 1;

// ---- VK_EXT_direct_mode_display extension commands
} else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_DIRECT_MODE_DISPLAY_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.ext_direct_mode_display = 1;

// ---- VK_EXT_acquire_xlib_display extension commands
void fill_out_enabled_instance_extensions(uint32_t extension_count, const char *const * extension_list, struct loader_instance_extension_enables* enables) {
for(uint32_t i = 0; i < extension_count; i++) {
if (strcmp(extension_list[i], VK_KHR_SURFACE_EXTENSION_NAME) == 0) { enables->khr_surface = true; }
if (strcmp(extension_list[i], VK_KHR_DISPLAY_EXTENSION_NAME) == 0) { enables->khr_display = true; }
#if defined(VK_USE_PLATFORM_XLIB_KHR)
if (strcmp(extension_list[i], VK_KHR_XLIB_SURFACE_EXTENSION_NAME) == 0) { enables->khr_xlib_surface = true; }
#endif // defined(VK_USE_PLATFORM_XLIB_KHR)
#if defined(VK_USE_PLATFORM_XCB_KHR)
if (strcmp(extension_list[i], VK_KHR_XCB_SURFACE_EXTENSION_NAME) == 0) { enables->khr_xcb_surface = true; }
#endif // defined(VK_USE_PLATFORM_XCB_KHR)
#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
if (strcmp(extension_list[i], VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME) == 0) { enables->khr_wayland_surface = true; }
#endif // defined(VK_USE_PLATFORM_WAYLAND_KHR)
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
if (strcmp(extension_list[i], VK_KHR_ANDROID_SURFACE_EXTENSION_NAME) == 0) { enables->khr_android_surface = true; }
#endif // defined(VK_USE_PLATFORM_ANDROID_KHR)
#if defined(VK_USE_PLATFORM_WIN32_KHR)
if (strcmp(extension_list[i], VK_KHR_WIN32_SURFACE_EXTENSION_NAME) == 0) { enables->khr_win32_surface = true; }
#endif // defined(VK_USE_PLATFORM_WIN32_KHR)
if (strcmp(extension_list[i], VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME) == 0) { enables->khr_get_physical_device_properties2 = true; }
if (strcmp(extension_list[i], VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME) == 0) { enables->khr_device_group_creation = true; }
if (strcmp(extension_list[i], VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME) == 0) { enables->khr_external_memory_capabilities = true; }
if (strcmp(extension_list[i], VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME) == 0) { enables->khr_external_semaphore_capabilities = true; }
if (strcmp(extension_list[i], VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME) == 0) { enables->khr_external_fence_capabilities = true; }
if (strcmp(extension_list[i], VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME) == 0) { enables->khr_get_surface_capabilities2 = true; }
if (strcmp(extension_list[i], VK_KHR_GET_DISPLAY_PROPERTIES_2_EXTENSION_NAME) == 0) { enables->khr_get_display_properties2 = true; }
if (strcmp(extension_list[i], VK_KHR_SURFACE_PROTECTED_CAPABILITIES_EXTENSION_NAME) == 0) { enables->khr_surface_protected_capabilities = true; }
if (strcmp(extension_list[i], VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME) == 0) { enables->khr_portability_enumeration = true; }
if (strcmp(extension_list[i], VK_EXT_DEBUG_REPORT_EXTENSION_NAME) == 0) { enables->ext_debug_report = true; }
#if defined(VK_USE_PLATFORM_GGP)
if (strcmp(extension_list[i], VK_GGP_STREAM_DESCRIPTOR_SURFACE_EXTENSION_NAME) == 0) { enables->ggp_stream_descriptor_surface = true; }
#endif // defined(VK_USE_PLATFORM_GGP)
if (strcmp(extension_list[i], VK_NV_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME) == 0) { enables->nv_external_memory_capabilities = true; }
if (strcmp(extension_list[i], VK_EXT_VALIDATION_FLAGS_EXTENSION_NAME) == 0) { enables->ext_validation_flags = true; }
#if defined(VK_USE_PLATFORM_VI_NN)
if (strcmp(extension_list[i], VK_NN_VI_SURFACE_EXTENSION_NAME) == 0) { enables->nn_vi_surface = true; }
#endif // defined(VK_USE_PLATFORM_VI_NN)
if (strcmp(extension_list[i], VK_EXT_DIRECT_MODE_DISPLAY_EXTENSION_NAME) == 0) { enables->ext_direct_mode_display = true; }
#if defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT)
} else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_ACQUIRE_XLIB_DISPLAY_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.ext_acquire_xlib_display = 1;
#endif // VK_USE_PLATFORM_XLIB_XRANDR_EXT

// ---- VK_EXT_display_surface_counter extension commands
} else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_DISPLAY_SURFACE_COUNTER_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.ext_display_surface_counter = 1;

// ---- VK_EXT_debug_utils extension commands
} else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_DEBUG_UTILS_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.ext_debug_utils = 1;

// ---- VK_EXT_acquire_drm_display extension commands
} else if (0 == strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_EXT_ACQUIRE_DRM_DISPLAY_EXTENSION_NAME)) {
ptr_instance->enabled_known_extensions.ext_acquire_drm_display = 1;
}
if (strcmp(extension_list[i], VK_EXT_ACQUIRE_XLIB_DISPLAY_EXTENSION_NAME) == 0) { enables->ext_acquire_xlib_display = true; }
#endif // defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT)
if (strcmp(extension_list[i], VK_EXT_DISPLAY_SURFACE_COUNTER_EXTENSION_NAME) == 0) { enables->ext_display_surface_counter = true; }
if (strcmp(extension_list[i], VK_EXT_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME) == 0) { enables->ext_swapchain_colorspace = true; }
#if defined(VK_USE_PLATFORM_IOS_MVK)
if (strcmp(extension_list[i], VK_MVK_IOS_SURFACE_EXTENSION_NAME) == 0) { enables->mvk_ios_surface = true; }
#endif // defined(VK_USE_PLATFORM_IOS_MVK)
#if defined(VK_USE_PLATFORM_MACOS_MVK)
if (strcmp(extension_list[i], VK_MVK_MACOS_SURFACE_EXTENSION_NAME) == 0) { enables->mvk_macos_surface = true; }
#endif // defined(VK_USE_PLATFORM_MACOS_MVK)
if (strcmp(extension_list[i], VK_EXT_DEBUG_UTILS_EXTENSION_NAME) == 0) { enables->ext_debug_utils = true; }
#if defined(VK_USE_PLATFORM_FUCHSIA)
if (strcmp(extension_list[i], VK_FUCHSIA_IMAGEPIPE_SURFACE_EXTENSION_NAME) == 0) { enables->fuchsia_imagepipe_surface = true; }
#endif // defined(VK_USE_PLATFORM_FUCHSIA)
#if defined(VK_USE_PLATFORM_METAL_EXT)
if (strcmp(extension_list[i], VK_EXT_METAL_SURFACE_EXTENSION_NAME) == 0) { enables->ext_metal_surface = true; }
#endif // defined(VK_USE_PLATFORM_METAL_EXT)
if (strcmp(extension_list[i], VK_EXT_VALIDATION_FEATURES_EXTENSION_NAME) == 0) { enables->ext_validation_features = true; }
if (strcmp(extension_list[i], VK_EXT_HEADLESS_SURFACE_EXTENSION_NAME) == 0) { enables->ext_headless_surface = true; }
if (strcmp(extension_list[i], VK_EXT_SURFACE_MAINTENANCE_1_EXTENSION_NAME) == 0) { enables->ext_surface_maintenance1 = true; }
if (strcmp(extension_list[i], VK_EXT_ACQUIRE_DRM_DISPLAY_EXTENSION_NAME) == 0) { enables->ext_acquire_drm_display = true; }
#if defined(VK_USE_PLATFORM_DIRECTFB_EXT)
if (strcmp(extension_list[i], VK_EXT_DIRECTFB_SURFACE_EXTENSION_NAME) == 0) { enables->ext_directfb_surface = true; }
#endif // defined(VK_USE_PLATFORM_DIRECTFB_EXT)
#if defined(VK_USE_PLATFORM_SCREEN_QNX)
if (strcmp(extension_list[i], VK_QNX_SCREEN_SURFACE_EXTENSION_NAME) == 0) { enables->qnx_screen_surface = true; }
#endif // defined(VK_USE_PLATFORM_SCREEN_QNX)
if (strcmp(extension_list[i], VK_GOOGLE_SURFACELESS_QUERY_EXTENSION_NAME) == 0) { enables->google_surfaceless_query = true; }
if (strcmp(extension_list[i], VK_LUNARG_DIRECT_DRIVER_LOADING_EXTENSION_NAME) == 0) { enables->lunarg_direct_driver_loading = true; }
if (strcmp(extension_list[i], VK_EXT_LAYER_SETTINGS_EXTENSION_NAME) == 0) { enables->ext_layer_settings = true; }
}
}
};

bool check_if_instance_extension_is_available(const struct loader_instance_extension_enables* enabled, const struct loader_instance_extension_enables* desired) {
if (desired->khr_surface && !enabled->khr_surface) return false;
if (desired->khr_display && !enabled->khr_display) return false;
#if defined(VK_USE_PLATFORM_XLIB_KHR)
if (desired->khr_xlib_surface && !enabled->khr_xlib_surface) return false;
#endif // defined(VK_USE_PLATFORM_XLIB_KHR)
#if defined(VK_USE_PLATFORM_XCB_KHR)
if (desired->khr_xcb_surface && !enabled->khr_xcb_surface) return false;
#endif // defined(VK_USE_PLATFORM_XCB_KHR)
#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
if (desired->khr_wayland_surface && !enabled->khr_wayland_surface) return false;
#endif // defined(VK_USE_PLATFORM_WAYLAND_KHR)
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
if (desired->khr_android_surface && !enabled->khr_android_surface) return false;
#endif // defined(VK_USE_PLATFORM_ANDROID_KHR)
#if defined(VK_USE_PLATFORM_WIN32_KHR)
if (desired->khr_win32_surface && !enabled->khr_win32_surface) return false;
#endif // defined(VK_USE_PLATFORM_WIN32_KHR)
if (desired->khr_get_physical_device_properties2 && !enabled->khr_get_physical_device_properties2) return false;
if (desired->khr_device_group_creation && !enabled->khr_device_group_creation) return false;
if (desired->khr_external_memory_capabilities && !enabled->khr_external_memory_capabilities) return false;
if (desired->khr_external_semaphore_capabilities && !enabled->khr_external_semaphore_capabilities) return false;
if (desired->khr_external_fence_capabilities && !enabled->khr_external_fence_capabilities) return false;
if (desired->khr_get_surface_capabilities2 && !enabled->khr_get_surface_capabilities2) return false;
if (desired->khr_get_display_properties2 && !enabled->khr_get_display_properties2) return false;
if (desired->khr_surface_protected_capabilities && !enabled->khr_surface_protected_capabilities) return false;
if (desired->khr_portability_enumeration && !enabled->khr_portability_enumeration) return false;
if (desired->ext_debug_report && !enabled->ext_debug_report) return false;
#if defined(VK_USE_PLATFORM_GGP)
if (desired->ggp_stream_descriptor_surface && !enabled->ggp_stream_descriptor_surface) return false;
#endif // defined(VK_USE_PLATFORM_GGP)
if (desired->nv_external_memory_capabilities && !enabled->nv_external_memory_capabilities) return false;
if (desired->ext_validation_flags && !enabled->ext_validation_flags) return false;
#if defined(VK_USE_PLATFORM_VI_NN)
if (desired->nn_vi_surface && !enabled->nn_vi_surface) return false;
#endif // defined(VK_USE_PLATFORM_VI_NN)
if (desired->ext_direct_mode_display && !enabled->ext_direct_mode_display) return false;
#if defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT)
if (desired->ext_acquire_xlib_display && !enabled->ext_acquire_xlib_display) return false;
#endif // defined(VK_USE_PLATFORM_XLIB_XRANDR_EXT)
if (desired->ext_display_surface_counter && !enabled->ext_display_surface_counter) return false;
if (desired->ext_swapchain_colorspace && !enabled->ext_swapchain_colorspace) return false;
#if defined(VK_USE_PLATFORM_IOS_MVK)
if (desired->mvk_ios_surface && !enabled->mvk_ios_surface) return false;
#endif // defined(VK_USE_PLATFORM_IOS_MVK)
#if defined(VK_USE_PLATFORM_MACOS_MVK)
if (desired->mvk_macos_surface && !enabled->mvk_macos_surface) return false;
#endif // defined(VK_USE_PLATFORM_MACOS_MVK)
if (desired->ext_debug_utils && !enabled->ext_debug_utils) return false;
#if defined(VK_USE_PLATFORM_FUCHSIA)
if (desired->fuchsia_imagepipe_surface && !enabled->fuchsia_imagepipe_surface) return false;
#endif // defined(VK_USE_PLATFORM_FUCHSIA)
#if defined(VK_USE_PLATFORM_METAL_EXT)
if (desired->ext_metal_surface && !enabled->ext_metal_surface) return false;
#endif // defined(VK_USE_PLATFORM_METAL_EXT)
if (desired->ext_validation_features && !enabled->ext_validation_features) return false;
if (desired->ext_headless_surface && !enabled->ext_headless_surface) return false;
if (desired->ext_surface_maintenance1 && !enabled->ext_surface_maintenance1) return false;
if (desired->ext_acquire_drm_display && !enabled->ext_acquire_drm_display) return false;
#if defined(VK_USE_PLATFORM_DIRECTFB_EXT)
if (desired->ext_directfb_surface && !enabled->ext_directfb_surface) return false;
#endif // defined(VK_USE_PLATFORM_DIRECTFB_EXT)
#if defined(VK_USE_PLATFORM_SCREEN_QNX)
if (desired->qnx_screen_surface && !enabled->qnx_screen_surface) return false;
#endif // defined(VK_USE_PLATFORM_SCREEN_QNX)
if (desired->google_surfaceless_query && !enabled->google_surfaceless_query) return false;
if (desired->lunarg_direct_driver_loading && !enabled->lunarg_direct_driver_loading) return false;
if (desired->ext_layer_settings && !enabled->ext_layer_settings) return false;
return true;
};

// Some device commands still need a terminator because the loader needs to unwrap something about them.
// In many cases, the item needing unwrapping is a VkPhysicalDevice or VkSurfaceKHR object. But there may be other items
Expand Down Expand Up @@ -12581,6 +12671,9 @@ const char *const LOADER_INSTANCE_EXTENSIONS[] = {
#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME,
#endif // VK_USE_PLATFORM_WAYLAND_KHR
#if defined(VK_USE_PLATFORM_ANDROID_KHR)
VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,
#endif // VK_USE_PLATFORM_ANDROID_KHR
#if defined(VK_USE_PLATFORM_WIN32_KHR)
VK_KHR_WIN32_SURFACE_EXTENSION_NAME,
#endif // VK_USE_PLATFORM_WIN32_KHR
Expand Down
Loading