fdo-mirrors/vulkan-wsi-layer
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/vulkan-wsi-layer.git synced 2026-05-05 07:38:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 'Fix the VK_KHR_DISPLAY implementation within the WSI Layer' into 'main'

Browse source 
See merge request mesa/vulkan-wsi-layer!127
This commit is contained in:
Rosen Zhelev 2024-11-25 11:32:34 +00:00
commit cb1a50cf7e
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wsi/display/surface.cpp
View file

@ -38,6 +38,7 @@ namespace display
surface::surface(drm_display_mode *display_mode, VkExtent2D extent)
: m_display_mode(display_mode)
, m_extent(extent)
, m_surface_properties(this)
{
}

1
wsi/display/surface_properties.cpp
View file

@ -332,6 +332,7 @@ GetDisplayPlaneCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkDisplayModeKHR
});
assert(valid_mode != display->get_display_modes_end());
UNUSED(valid_mode);
VkDisplayPlaneCapabilitiesKHR planeCapabilities{};
planeCapabilities.supportedAlpha = VK_DISPLAY_PLANE_ALPHA_OPAQUE_BIT_KHR;

7
wsi/display/swapchain.cpp
View file

@ -524,8 +524,9 @@ void swapchain::present_image(const pending_present_request &pending_present)
}
else
{
assert(FD_ISSET(display->get_drm_fd(), &fds));
int result = FD_ISSET(display->get_drm_fd(), &fds);
assert(result > 0);
UNUSED(result);
drmEventContext ev = {};
ev.version = DRM_EVENT_CONTEXT_VERSION;
ev.page_flip_handler = page_flip_event;
@ -603,9 +604,9 @@ void swapchain::destroy_image(swapchain_image &image)
}
if (image_data->fb_id != std::numeric_limits<uint32_t>::max())
{
int result = drmModeRmFB(display->get_drm_fd(), image_data->fb_id);
assert(result == 0);
UNUSED(result);
}
m_allocator.destroy(1, image_data);