Skip to content

tests: Support wayland in render framework #512

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

Merged
charles-lunarg merged 2 commits into from
May 17, 2026
+131 −30
Merged

tests: Support wayland in render framework #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d4485c
test: Check errors in InitSwapchain
charles-lunarg May 15, 2026
9fb7e42
tests: Support wayland in render framework
charles-lunarg May 15, 2026
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
19 changes: 17 additions & 2 deletions tests/extension_layer_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2015-2022 The Khronos Group Inc.
* Copyright (c) 2015-2024 Valve Corporation
* Copyright (c) 2015-2024 LunarG, Inc.
* Copyright (c) 2015-2026 Valve Corporation
* Copyright (c) 2015-2026 LunarG, Inc.
* Copyright (c) 2015-2022 Google, Inc.
* Copyright (c) 2015-2023 Nvidia Corporation.
*
Expand All @@ -28,6 +28,10 @@
#include "extension_layer_tests.h"
#include <vulkan/utility/vk_struct_helper.hpp>

#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
#include <wayland-client.h>
#endif

// Global list of sType,size identifiers
std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info{};

Expand Down Expand Up @@ -362,6 +366,17 @@ bool VkExtensionLayerTest::AddSurfaceInstanceExtension() {
bSupport = true;
#endif

#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
if (!InstanceExtensionSupported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME)) {
printf("%s %s extension not supported\n", kSkipPrefix, VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
return false;
}
if (!bSupport && wl_display_connect(nullptr)) {
instance_extensions_.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
bSupport = true;
}
#endif

#if defined(VK_USE_PLATFORM_XLIB_KHR)
if (!InstanceExtensionSupported(VK_KHR_XLIB_SURFACE_EXTENSION_NAME)) {
printf("%s %s extension not supported\n", kSkipPrefix, VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
Expand Down
142 changes: 114 additions & 28 deletions tests/vkrenderframework.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Copyright (c) 2015-2022 The Khronos Group Inc.
* Copyright (c) 2015-2025 Valve Corporation
* Copyright (c) 2015-2025 LunarG, Inc.
* Copyright (c) 2015-2026 Valve Corporation
* Copyright (c) 2015-2026 LunarG, Inc.
* Copyright (c) 2015-2022 Google, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -33,6 +33,10 @@

#include <vulkan/utility/vk_struct_helper.hpp>

#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
#include <wayland-client.h>
#endif

using std::string;
using std::strncmp;
using std::vector;
Expand Down Expand Up @@ -639,21 +643,82 @@ bool VkRenderFramework::InitSurface(float width, float height) {
if (err != VK_SUCCESS) return false;
#endif

#if defined(VK_USE_PLATFORM_XLIB_KHR)
Display *dpy = XOpenDisplay(NULL);
if (dpy) {
int s = DefaultScreen(dpy);
Window window = XCreateSimpleWindow(dpy, RootWindow(dpy, s), 0, 0, (int)m_width, (int)m_height, 1, BlackPixel(dpy, s),
WhitePixel(dpy, s));
VkXlibSurfaceCreateInfoKHR surface_create_info = {};
surface_create_info.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
surface_create_info.dpy = dpy;
surface_create_info.window = window;
VkResult err = vkCreateXlibSurfaceKHR(instance(), &surface_create_info, nullptr, &m_surface);
#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
if (m_surface == VK_NULL_HANDLE) {
wl_display *display = nullptr;
wl_registry *registry = nullptr;
wl_surface *surface = nullptr;
wl_compositor *compositor = nullptr;
display = wl_display_connect(nullptr);
if (!display) {
return false;
}

auto global = [](void *data, struct wl_registry *registry, uint32_t id, const char *interface, uint32_t version) {
(void)version;
const std::string_view interface_str = interface;
if (interface_str == "wl_compositor") {
auto compositor = reinterpret_cast<wl_compositor **>(data);
*compositor = reinterpret_cast<wl_compositor *>(wl_registry_bind(registry, id, &wl_compositor_interface, 1));
}
};

auto global_remove = [](void *data, struct wl_registry *registry, uint32_t id) {
(void)data;
(void)registry;
(void)id;
};

registry = wl_display_get_registry(display);
if (!registry) {
return false;
}

const wl_registry_listener registry_listener = {global, global_remove};

wl_registry_add_listener(registry, &registry_listener, &compositor);

wl_display_dispatch(display);
if (!compositor) {
return false;
}

surface = wl_compositor_create_surface(compositor);
if (!surface) {
return false;
}

const uint32_t version = wl_surface_get_version(surface);
if (version == 0) {
return false;
}

VkWaylandSurfaceCreateInfoKHR surface_create_info = {};
surface_create_info.sType = VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR;
surface_create_info.display = display;
surface_create_info.surface = surface;
VkResult err = vkCreateWaylandSurfaceKHR(instance(), &surface_create_info, nullptr, &m_surface);
if (err != VK_SUCCESS) return false;
}
#endif

#if defined(VK_USE_PLATFORM_XLIB_KHR)
if (m_surface == VK_NULL_HANDLE) {
Display *dpy = XOpenDisplay(NULL);
if (dpy) {
int s = DefaultScreen(dpy);
Window window = XCreateSimpleWindow(dpy, RootWindow(dpy, s), 0, 0, (int)m_width, (int)m_height, 1, BlackPixel(dpy, s),
WhitePixel(dpy, s));
VkXlibSurfaceCreateInfoKHR surface_create_info = {};
surface_create_info.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
surface_create_info.dpy = dpy;
surface_create_info.window = window;
VkResult err = vkCreateXlibSurfaceKHR(instance(), &surface_create_info, nullptr, &m_surface);
if (err != VK_SUCCESS) return false;
}
}
#endif

#if defined(VK_USE_PLATFORM_XCB_KHR)
if (m_surface == VK_NULL_HANDLE) {
xcb_connection_t *connection = xcb_connect(NULL, NULL);
Comment thread
charles-lunarg marked this conversation as resolved.
Expand Down Expand Up @@ -681,23 +746,38 @@ bool VkRenderFramework::InitSwapchain(VkImageUsageFlags imageUsage, VkSurfaceTra

bool VkRenderFramework::InitSwapchain(VkSurfaceKHR &surface, VkImageUsageFlags imageUsage,
VkSurfaceTransformFlagBitsKHR preTransform) {
VkSurfaceCapabilitiesKHR capabilities;
vkGetPhysicalDeviceSurfaceCapabilitiesKHR(m_device->phy().handle(), surface, &capabilities);

uint32_t format_count;
vkGetPhysicalDeviceSurfaceFormatsKHR(m_device->phy().handle(), surface, &format_count, nullptr);
VkSurfaceCapabilitiesKHR capabilities{};
VkResult err = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(m_device->phy().handle(), surface, &capabilities);
if (err != VK_SUCCESS) {
return false;
}
uint32_t format_count = 0;
err = vkGetPhysicalDeviceSurfaceFormatsKHR(m_device->phy().handle(), surface, &format_count, nullptr);
if (err != VK_SUCCESS) {
return false;
}
vector<VkSurfaceFormatKHR> formats;
if (format_count != 0) {
formats.resize(format_count);
vkGetPhysicalDeviceSurfaceFormatsKHR(m_device->phy().handle(), surface, &format_count, formats.data());
err = vkGetPhysicalDeviceSurfaceFormatsKHR(m_device->phy().handle(), surface, &format_count, formats.data());
if (err != VK_SUCCESS) {
return false;
}
}

uint32_t present_mode_count;
vkGetPhysicalDeviceSurfacePresentModesKHR(m_device->phy().handle(), surface, &present_mode_count, nullptr);
uint32_t present_mode_count = 0;
err = vkGetPhysicalDeviceSurfacePresentModesKHR(m_device->phy().handle(), surface, &present_mode_count, nullptr);
if (err != VK_SUCCESS) {
return false;
}
vector<VkPresentModeKHR> present_modes;
if (present_mode_count != 0) {
present_modes.resize(present_mode_count);
vkGetPhysicalDeviceSurfacePresentModesKHR(m_device->phy().handle(), surface, &present_mode_count, present_modes.data());
err =
vkGetPhysicalDeviceSurfacePresentModesKHR(m_device->phy().handle(), surface, &present_mode_count, present_modes.data());
if (err != VK_SUCCESS) {
return false;
}
}

VkSwapchainCreateInfoKHR swapchain_create_info = {};
Expand All @@ -721,15 +801,21 @@ bool VkRenderFramework::InitSwapchain(VkSurfaceKHR &surface, VkImageUsageFlags i
swapchain_create_info.clipped = VK_FALSE;
swapchain_create_info.oldSwapchain = 0;

VkResult err = vkCreateSwapchainKHR(device(), &swapchain_create_info, nullptr, &m_swapchain);
err = vkCreateSwapchainKHR(device(), &swapchain_create_info, nullptr, &m_swapchain);
if (err != VK_SUCCESS) {
return false;
}
uint32_t imageCount = 0;
vkGetSwapchainImagesKHR(device(), m_swapchain, &imageCount, nullptr);
err = vkGetSwapchainImagesKHR(device(), m_swapchain, &imageCount, nullptr);
if (err != VK_SUCCESS) {
return false;
}
vector<VkImage> swapchainImages;
swapchainImages.resize(imageCount);
vkGetSwapchainImagesKHR(device(), m_swapchain, &imageCount, swapchainImages.data());
err = vkGetSwapchainImagesKHR(device(), m_swapchain, &imageCount, swapchainImages.data());
if (err != VK_SUCCESS) {
return false;
}
return true;
}

Expand Down Expand Up @@ -1191,7 +1277,7 @@ void VkImageObj::ImageMemoryBarrier(VkCommandBufferObj *cmd_buf, VkImageAspectFl

// write barrier to the command buffer
vkCmdPipelineBarrier(cmd_buf->handle(), src_stages, dest_stages, VK_DEPENDENCY_BY_REGION_BIT, 0, NULL, 0, NULL, 1,
pmemory_barrier);
pmemory_barrier);
}

void VkImageObj::SetLayout(VkCommandBufferObj *cmd_buf, VkImageAspectFlags aspect, VkImageLayout image_layout) {
Expand Down Expand Up @@ -1983,7 +2069,7 @@ void VkCommandBufferObj::PipelineBarrier(VkPipelineStageFlags src_stages, VkPipe
const VkBufferMemoryBarrier *pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount,
const VkImageMemoryBarrier *pImageMemoryBarriers) {
vkCmdPipelineBarrier(handle(), src_stages, dest_stages, dependencyFlags, memoryBarrierCount, pMemoryBarriers,
bufferMemoryBarrierCount, pBufferMemoryBarriers, imageMemoryBarrierCount, pImageMemoryBarriers);
bufferMemoryBarrierCount, pBufferMemoryBarriers, imageMemoryBarrierCount, pImageMemoryBarriers);
}

void VkCommandBufferObj::ClearAllBuffers(const vector<std::unique_ptr<VkImageObj>> &color_objs, VkClearColorValue clear_color,
Expand Down Expand Up @@ -2125,7 +2211,7 @@ void VkCommandBufferObj::BindDescriptorSet(VkDescriptorSetObj &descriptorSet) {
// bind pipeline, vertex buffer (descriptor set) and WVP (dynamic buffer view)
if (set_obj) {
vkCmdBindDescriptorSets(handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, descriptorSet.GetPipelineLayout(), 0, 1, &set_obj, 0,
NULL);
NULL);
}
}

Expand Down
Loading