diff --git a/docs/features.txt b/docs/features.txt index 140f5cc0e9a..fcd46e55645 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -582,7 +582,7 @@ Khronos extensions that are not part of any Vulkan version: VK_KHR_swapchain DONE (anv, dzn, hasvk, hk, lvp, nvk, panvk, pvr, radv, tu, v3dv, vn) VK_KHR_swapchain_mutable_format DONE (anv, hasvk, hk, lvp, nvk, pvr, radv, tu, v3dv, vn) VK_KHR_unified_image_layouts DONE (lvp, nvk, panvk, radv/gfx11+, tu) - VK_KHR_wayland_surface DONE (anv, dzn, hk, lvp, nvk, panvk, radv, tu, v3dv, vn) + VK_KHR_wayland_surface DONE (anv, dzn, hk, lvp, nvk, panvk, pvr, radv, tu, v3dv, vn) VK_KHR_workgroup_memory_explicit_layout DONE (anv, hk, lvp, nvk, hasvk, radv, tu, v3dv, vn) VK_KHR_win32_keyed_mutex not started VK_KHR_win32_surface DONE (dzn, lvp) diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt index d4c5b44d3af..d7384bceae5 100644 --- a/docs/relnotes/new_features.txt +++ b/docs/relnotes/new_features.txt @@ -85,3 +85,4 @@ VK_EXT_map_memory_placed on pvr VK_KHR_device_group on pvr VK_KHR_buffer_device_address on pvr GL_EXT_mesh_shader on zink +VK_KHR_wayland_surface on pvr diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c index 1afe87fbc2e..37495983e17 100644 --- a/src/imagination/vulkan/pvr_device.c +++ b/src/imagination/vulkan/pvr_device.c @@ -161,6 +161,9 @@ static const struct vk_instance_extension_table pvr_instance_extensions = { .KHR_get_physical_device_properties2 = true, .KHR_get_surface_capabilities2 = PVR_USE_WSI_PLATFORM, .KHR_surface = PVR_USE_WSI_PLATFORM, +#ifdef VK_USE_PLATFORM_WAYLAND_KHR + .KHR_wayland_surface = true, +#endif #ifndef VK_USE_PLATFORM_WIN32_KHR .EXT_headless_surface = PVR_USE_WSI_PLATFORM && false, #endif diff --git a/src/imagination/vulkan/pvr_device.h b/src/imagination/vulkan/pvr_device.h index d18abf10074..258a2c7b528 100644 --- a/src/imagination/vulkan/pvr_device.h +++ b/src/imagination/vulkan/pvr_device.h @@ -36,7 +36,8 @@ # define PVR_USE_WSI_PLATFORM_DISPLAY false #endif -#if PVR_USE_WSI_PLATFORM_DISPLAY +#if defined(VK_USE_PLATFORM_DISPLAY_KHR) || \ + defined(VK_USE_PLATFORM_WAYLAND_KHR) # define PVR_USE_WSI_PLATFORM true #else # define PVR_USE_WSI_PLATFORM false