Add support for Vulkan on Wayland #3994
Conversation
|
please try to adjust to our coding style as described in here: https://github.com/RPCS3/rpcs3/wiki/Coding-Style There are a lot of missing or wrong indentations like with the namespaces and you often have opening braces in the same line instead of a new one. |
rpcs3/rpcs3qt/gs_frame.cpp
Outdated
| @@ -145,6 +150,17 @@ void gs_frame::show() | |||
| }); | |||
| } | |||
|
|
|||
| #ifdef VK_USE_PLATFORM_WAYLAND_KHR | |||
| std::pair<wl_display*, wl_surface*> gs_frame::wayland_handle() const | |||
| { | |||
There was a problem hiding this comment.
Move this into gs_frame::handle(). The checks in VKGSRender to check if wayland handle is valid can also be done there.
rpcs3/Emu/RSX/VK/VKHelpers.h
Outdated
| #ifdef VK_USE_PLATFORM_WAYLAND_KHR | ||
| , std::pair<wl_display*, wl_surface*> | ||
| #endif | ||
| > VkUnixContext; |
There was a problem hiding this comment.
This template can be moved to gsframe header instead as it is not restricted to use with vulkan only and holds general unix window and display properties. Name can be changed to reflect that as well, something like unix_display_context or something along those lines
valpackett
force-pushed
the
wayland-vulkan
branch
2 times, most recently
from
13c05bb
to
bffeda5
Compare
The variable VK_USE_PLATFORM_WAYLAND_KHR is actually used by the Vulkan header, so use it here too.
valpackett
force-pushed
the
wayland-vulkan
branch
from
bffeda5
to
fad5e8d
Compare
|
Moved the stuff to gsframe header. New version: also moved some identical code outside of platform ifdefs in VKGSRender.cpp |
rpcs3/rpcs3qt/gs_frame.cpp
Outdated
| @@ -8,6 +8,13 @@ | |||
| #include <QTimer> | |||
| #include <QThread> | |||
|
|
|||
| #ifdef VK_USE_PLATFORM_WAYLAND_KHR | |||
There was a problem hiding this comment.
This whole block from line 11 to 16 should be in an ifndef _WIN32 block. That should fix appveyor CI and allow this set to be mergeable
Works on
QT_QPA_PLATFORM=wayland-egl: