sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VulkanRenderer: Enable Wayland/XLib support

This commit is contained in:
Jérôme Leclercq 2020-09-01 19:20:59 +02:00
parent 7ea0b223ec
commit 424e6437c1
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/scripts/tools/vulkanrenderer.lua
View File

@ -35,9 +35,9 @@ TOOL.Libraries = {
TOOL.OsDefines.Linux = {
-- "VK_USE_PLATFORM_MIR_KHR",
"VK_USE_PLATFORM_XCB_KHR"
-- "VK_USE_PLATFORM_XLIB_KHR",
-- "VK_USE_PLATFORM_WAYLAND_KHR"
-- "VK_USE_PLATFORM_XCB_KHR"
"VK_USE_PLATFORM_XLIB_KHR",
"VK_USE_PLATFORM_WAYLAND_KHR"
}
TOOL.OsDefines.BSD = TOOL.OsDefines.Linux

8
src/Nazara/VulkanRenderer/VulkanSurface.cpp
View File

@ -29,7 +29,8 @@ namespace Nz
{
switch (handle.type)
{
case WindowManager::Wayland:
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
case WindowManager::Wayland:
{
wl_display* display = static_cast<wl_display*>(handle.wayland.display);
wl_surface* surface = static_cast<wl_surface*>(handle.wayland.surface);
@ -37,7 +38,9 @@ namespace Nz
success = m_surface.Create(display, surface);
break;
}
#endif
#ifdef VK_USE_PLATFORM_XLIB_KHR
case WindowManager::X11:
{
Display* display = static_cast<Display*>(handle.x11.display);
@ -46,10 +49,11 @@ namespace Nz
success = m_surface.Create(display, window);
break;
}
#endif
default:
{
NazaraError("unexpected window type");
NazaraError("unhandled window type");
return false;
}
}