From 0e3fdebb114b7146832429a809cfcaf275203a60 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 16 Jun 2020 01:06:56 +1000 Subject: [PATCH] Qt: Don't set native window to GL surface Might be related to the GLX crashes some people are experiencing... --- src/duckstation-qt/openglhostdisplay.cpp | 11 ----------- src/duckstation-qt/openglhostdisplay.h | 2 -- 2 files changed, 13 deletions(-) diff --git a/src/duckstation-qt/openglhostdisplay.cpp b/src/duckstation-qt/openglhostdisplay.cpp index 78a12b0c3..4feaca1fc 100644 --- a/src/duckstation-qt/openglhostdisplay.cpp +++ b/src/duckstation-qt/openglhostdisplay.cpp @@ -60,17 +60,6 @@ OpenGLHostDisplay::OpenGLHostDisplay(QtHostInterface* host_interface) : QtHostDi OpenGLHostDisplay::~OpenGLHostDisplay() = default; -QtDisplayWidget* OpenGLHostDisplay::createWidget(QWidget* parent) -{ - QtDisplayWidget* widget = QtHostDisplay::createWidget(parent); - - QWindow* native_window = widget->windowHandle(); - Assert(native_window); - native_window->setSurfaceType(QWindow::OpenGLSurface); - - return widget; -} - HostDisplay::RenderAPI OpenGLHostDisplay::GetRenderAPI() const { return m_gl_context->IsGLES() ? HostDisplay::RenderAPI::OpenGLES : HostDisplay::RenderAPI::OpenGL; diff --git a/src/duckstation-qt/openglhostdisplay.h b/src/duckstation-qt/openglhostdisplay.h index 7a3eaac41..6ec94678f 100644 --- a/src/duckstation-qt/openglhostdisplay.h +++ b/src/duckstation-qt/openglhostdisplay.h @@ -25,8 +25,6 @@ public: OpenGLHostDisplay(QtHostInterface* host_interface); ~OpenGLHostDisplay(); - QtDisplayWidget* createWidget(QWidget* parent) override; - bool hasDeviceContext() const override; bool createDeviceContext(bool debug_device) override; bool initializeDeviceContext(bool debug_device) override;