From e8849db78abe4db518c7f324323b88f478acc69a Mon Sep 17 00:00:00 2001
From: Arisotura <thetotalworm@gmail.com>
Date: Wed, 27 May 2020 21:40:02 +0200
Subject: we don't need a GLShim.
blarg.
I don't understand this anymore.
---
src/frontend/qt_sdl/main.cpp | 18 ++----------------
src/frontend/qt_sdl/main.h | 12 +-----------
2 files changed, 3 insertions(+), 27 deletions(-)
(limited to 'src/frontend/qt_sdl')
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 8f2a61e..f282310 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -268,7 +268,7 @@ void EmuThread::initOpenGL()
QOpenGLContext* windowctx = mainWindow->getOGLContext();
QSurfaceFormat format = windowctx->format();
- /*oglSurface = new QOffscreenSurface();
+ oglSurface = new QOffscreenSurface();
oglSurface->setFormat(format);
oglSurface->create();
if (!oglSurface->isValid())
@@ -277,8 +277,7 @@ void EmuThread::initOpenGL()
printf("oglSurface shat itself :(\n");
delete oglSurface;
return;
- }*/
- oglSurface = new GLShim(format);
+ }
oglContext = new QOpenGLContext();//oglSurface);
oglContext->setFormat(oglSurface->format());
@@ -958,19 +957,6 @@ void ScreenPanelGL::onScreenLayoutChanged()
}
-GLShim::GLShim(QSurfaceFormat& format) : QWindow()
-{
- setSurfaceType(QSurface::OpenGLSurface);
- setFormat(format);
- create();
- hide();
-}
-
-GLShim::~GLShim()
-{
-}
-
-
MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent)
{
setWindowTitle("melonDS " MELONDS_VERSION);
diff --git a/src/frontend/qt_sdl/main.h b/src/frontend/qt_sdl/main.h
index 2a24960..8759e95 100644
--- a/src/frontend/qt_sdl/main.h
+++ b/src/frontend/qt_sdl/main.h
@@ -75,7 +75,7 @@ private:
int PrevEmuStatus;
int EmuRunning;
- QSurface* oglSurface;
+ QOffscreenSurface* oglSurface;
QOpenGLContext* oglContext;
};
@@ -163,16 +163,6 @@ private:
};
-class GLShim : public QWindow
-{
- Q_OBJECT
-
-public:
- explicit GLShim(QSurfaceFormat& format);
- ~GLShim();
-};
-
-
class MainWindow : public QMainWindow
{
Q_OBJECT
--
cgit v1.2.3