AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: advertise present_id/wait behind ANV_USE_WSI_PLATFORM

Browse Source 
wsi_common_vk_instance_supports_present_wait returns true for all
supported wsi platforms here, so we can unconditionally advertise them
behind ANV_USE_WSI_PLATFORM like the other wsi extensions (also to not
tangle with Android).

v2: guard presentId2 and presentWait2 features as well

Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> (v1)
Acked-by: Daniel Stone <daniels@collabora.com> (v1)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36835>
This commit is contained in:
Yiwei Zhang
2025-08-18 22:09:22 -07:00
committed by Marge Bot
parent 9669b1852b
commit fc2c490975
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/intel/vulkan/anv_instance.c
View File

@@ -12,7 +12,6 @@ static const driOptionDescription anv_dri_options[] = {
DRI_CONF_ADAPTIVE_SYNC(true)
DRI_CONF_VK_X11_OVERRIDE_MIN_IMAGE_COUNT(0)
DRI_CONF_VK_X11_STRICT_IMAGE_COUNT(false)
DRI_CONF_VK_KHR_PRESENT_WAIT(false)
DRI_CONF_VK_XWAYLAND_WAIT_READY(false)
DRI_CONF_ANV_ASSUME_FULL_SUBGROUPS(0)
DRI_CONF_ANV_ASSUME_FULL_SUBGROUPS_WITH_BARRIER(false)

25
src/intel/vulkan/anv_physical_device.c
View File

@@ -205,20 +205,13 @@ get_device_extensions(const struct anv_physical_device *device,
!(device->instance->debug & ANV_DEBUG_NO_SECONDARY_CALL),
.KHR_pipeline_executable_properties = true,
.KHR_pipeline_library = true,
/* Hide these behind dri configs for now since we cannot implement it reliably on
* all surfaces yet. There is no surface capability query for present wait/id,
* but the feature is useful enough to hide behind an opt-in mechanism for now.
* If the instance only enables surface extensions that unconditionally support present wait,
* we can also expose the extension that way. */
.KHR_present_id =
driQueryOptionb(&device->instance->dri_options, "vk_khr_present_wait") ||
wsi_common_vk_instance_supports_present_wait(&device->instance->vk),
.KHR_present_wait =
driQueryOptionb(&device->instance->dri_options, "vk_khr_present_wait") ||
wsi_common_vk_instance_supports_present_wait(&device->instance->vk),
.KHR_push_descriptor = true,
#ifdef ANV_USE_WSI_PLATFORM
.KHR_present_id = true,
.KHR_present_id2 = true,
.KHR_present_wait = true,
.KHR_present_wait2 = true,
#endif
.KHR_push_descriptor = true,
.KHR_ray_query = rt_enabled,
.KHR_ray_tracing_maintenance1 = rt_enabled,
.KHR_ray_tracing_pipeline = rt_enabled,
@@ -842,11 +835,13 @@ get_features(const struct anv_physical_device *pdevice,
/* VK_EXT_depth_clip_control */
.depthClipControl = true,
#ifdef ANV_USE_WSI_PLATFORM
/* VK_KHR_present_id */
.presentId = pdevice->vk.supported_extensions.KHR_present_id,
.presentId = true,
/* VK_KHR_present_wait */
.presentWait = pdevice->vk.supported_extensions.KHR_present_wait,
.presentWait = true,
#endif
/* VK_EXT_vertex_input_dynamic_state */
.vertexInputDynamicState = true,
@@ -974,11 +969,13 @@ get_features(const struct anv_physical_device *pdevice,
/* VK_KHR_maintenance9 */
.maintenance9 = true,
#ifdef ANV_USE_WSI_PLATFORM
/* VK_KHR_present_id2 */
.presentId2 = true,
/* VK_KHR_present_wait2 */
.presentWait2 = true,
#endif
/* VK_KHR_shader_untyped_pointers */
.shaderUntypedPointers = true,