ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure wayland surface is created for OpenGL, too.

This commit is contained in:
BearOso 2023-07-16 13:28:44 -05:00
parent 6d71430806
commit 61bafc329d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qt/src/EmuCanvasVulkan.cpp
View File

@ -94,11 +94,6 @@ void EmuCanvasVulkan::createContext()
if (platform == "wayland") if (platform == "wayland")
{ {
wayland_surface = std::make_unique<WaylandSurface>(); wayland_surface = std::make_unique<WaylandSurface>();
if (!main_window->isVisible())
{
main_window->setVisible(true);
QGuiApplication::processEvents();
}
auto display = (wl_display *)pni->nativeResourceForWindow("display", window); auto display = (wl_display *)pni->nativeResourceForWindow("display", window);
auto surface = (wl_surface *)pni->nativeResourceForWindow("surface", main_window->windowHandle()); auto surface = (wl_surface *)pni->nativeResourceForWindow("surface", main_window->windowHandle());
wayland_surface->attach(display, surface, { parent->x(), parent->y(), width(), height(), static_cast<int>(devicePixelRatio()) }); wayland_surface->attach(display, surface, { parent->x(), parent->y(), width(), height(), static_cast<int>(devicePixelRatio()) });

3
qt/src/EmuMainWindow.cpp
View File

@ -6,6 +6,7 @@
#include <QtEvents> #include <QtEvents>
#include <QGuiApplication> #include <QGuiApplication>
#include <QStackedWidget> #include <QStackedWidget>
#include <qguiapplication.h>
#include <qnamespace.h> #include <qnamespace.h>
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
@ -82,6 +83,8 @@ void EmuMainWindow::createCanvas()
if (QGuiApplication::platformName() == "wayland" && app->config->display_driver != "qt") if (QGuiApplication::platformName() == "wayland" && app->config->display_driver != "qt")
{ {
auto central_widget = new QStackedWidget(); auto central_widget = new QStackedWidget();
setVisible(true);
QGuiApplication::processEvents();
if (app->config->display_driver == "vulkan") if (app->config->display_driver == "vulkan")
{ {