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

Qt: Port to QOpenGLWidget

This commit is contained in:
Vicki Pfau 2019-05-14 20:25:27 -07:00
parent 1baa9287f3
commit 4bd788f715
4 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform/qt/Display.cpp
View File

@ -18,13 +18,15 @@ Display::Driver Display::s_driver = Display::Driver::QT;
Display* Display::create(QWidget* parent) { Display* Display::create(QWidget* parent) {
#if defined(BUILD_GL) || defined(BUILD_GLES2) || defined(USE_EPOXY) #if defined(BUILD_GL) || defined(BUILD_GLES2) || defined(USE_EPOXY)
QGLFormat format(QGLFormat(QGL::Rgba | QGL::DoubleBuffer)); QSurfaceFormat format;
format.setSwapInterval(1); format.setSwapInterval(1);
format.setSwapBehavior(QSurfaceFormat::TripleBuffer);
#endif #endif
switch (s_driver) { switch (s_driver) {
#if defined(BUILD_GL) || defined(BUILD_GLES2) || defined(USE_EPOXY) #if defined(BUILD_GL) || defined(BUILD_GLES2) || defined(USE_EPOXY)
case Driver::OPENGL: case Driver::OPENGL:
format.setVersion(3, 0);
return new DisplayGL(format, parent); return new DisplayGL(format, parent);
#endif #endif
#ifdef BUILD_GL #ifdef BUILD_GL

63
src/platform/qt/DisplayGL.cpp
View File

@ -10,8 +10,11 @@
#include "CoreController.h" #include "CoreController.h"
#include <QApplication> #include <QApplication>
#include <QOpenGLContext>
#include <QOpenGLPaintDevice>
#include <QResizeEvent> #include <QResizeEvent>
#include <QTimer> #include <QTimer>
#include <QWindow>
#include <mgba/core/core.h> #include <mgba/core/core.h>
#include <mgba-util/math.h> #include <mgba-util/math.h>
@ -27,16 +30,17 @@
using namespace QGBA; using namespace QGBA;
DisplayGL::DisplayGL(const QGLFormat& format, QWidget* parent) DisplayGL::DisplayGL(const QSurfaceFormat& format, QWidget* parent)
: Display(parent) : Display(parent)
, m_gl(nullptr) , m_gl(nullptr)
{ {
// This can spontaneously re-enter into this->resizeEvent before creation is done, so we // This can spontaneously re-enter into this->resizeEvent before creation is done, so we
// need to make sure it's initialized to nullptr before we assign the new object to it // need to make sure it's initialized to nullptr before we assign the new object to it
m_gl = new EmptyGLWidget(format, this); m_gl = new QOpenGLContext;
m_painter = new PainterGL(format.majorVersion() < 2 ? 1 : m_gl->format().majorVersion(), &m_videoProxy, m_gl); m_gl->setFormat(format);
m_gl->setMouseTracking(true); m_gl->create();
m_gl->setAttribute(Qt::WA_TransparentForMouseEvents); // This doesn't seem to work? setAttribute(Qt::WA_NativeWindow);
m_painter = new PainterGL(&m_videoProxy, windowHandle(), m_gl);
setUpdatesEnabled(false); // Prevent paint events, which can cause race conditions setUpdatesEnabled(false); // Prevent paint events, which can cause race conditions
connect(&m_videoProxy, &VideoProxy::dataAvailable, &m_videoProxy, &VideoProxy::processData); connect(&m_videoProxy, &VideoProxy::dataAvailable, &m_videoProxy, &VideoProxy::processData);
@ -46,6 +50,7 @@ DisplayGL::DisplayGL(const QGLFormat& format, QWidget* parent)
DisplayGL::~DisplayGL() { DisplayGL::~DisplayGL() {
stopDrawing(); stopDrawing();
delete m_painter; delete m_painter;
delete m_gl;
} }
bool DisplayGL::supportsShaders() const { bool DisplayGL::supportsShaders() const {
@ -71,11 +76,10 @@ void DisplayGL::startDrawing(std::shared_ptr<CoreController> controller) {
m_painter->setMessagePainter(messagePainter()); m_painter->setMessagePainter(messagePainter());
m_context = controller; m_context = controller;
m_painter->resize(size()); m_painter->resize(size());
m_gl->move(0, 0);
m_drawThread = new QThread(this); m_drawThread = new QThread(this);
m_drawThread->setObjectName("Painter Thread"); m_drawThread->setObjectName("Painter Thread");
m_gl->context()->doneCurrent(); m_gl->doneCurrent();
m_gl->context()->moveToThread(m_drawThread); m_gl->moveToThread(m_drawThread);
m_painter->moveToThread(m_drawThread); m_painter->moveToThread(m_drawThread);
m_videoProxy.moveToThread(m_drawThread); m_videoProxy.moveToThread(m_drawThread);
connect(m_drawThread, &QThread::started, m_painter, &PainterGL::start); connect(m_drawThread, &QThread::started, m_painter, &PainterGL::start);
@ -100,7 +104,7 @@ void DisplayGL::stopDrawing() {
m_drawThread->exit(); m_drawThread->exit();
m_drawThread = nullptr; m_drawThread = nullptr;
m_gl->context()->makeCurrent(); m_gl->makeCurrent(windowHandle());
#if defined(_WIN32) && defined(USE_EPOXY) #if defined(_WIN32) && defined(USE_EPOXY)
epoxy_handle_external_wglMakeCurrent(); epoxy_handle_external_wglMakeCurrent();
#endif #endif
@ -185,9 +189,6 @@ void DisplayGL::resizeEvent(QResizeEvent* event) {
} }
void DisplayGL::resizePainter() { void DisplayGL::resizePainter() {
if (m_gl) {
m_gl->resize(size());
}
if (m_drawThread) { if (m_drawThread) {
QMetaObject::invokeMethod(m_painter, "resize", Qt::BlockingQueuedConnection, Q_ARG(QSize, size())); QMetaObject::invokeMethod(m_painter, "resize", Qt::BlockingQueuedConnection, Q_ARG(QSize, size()));
} }
@ -204,8 +205,9 @@ int DisplayGL::framebufferHandle() {
return m_painter->glTex(); return m_painter->glTex();
} }
PainterGL::PainterGL(int majorVersion, VideoProxy* proxy, QGLWidget* parent) PainterGL::PainterGL(VideoProxy* proxy, QWindow* surface, QOpenGLContext* parent)
: m_gl(parent) : m_gl(parent)
, m_surface(surface)
, m_videoProxy(proxy) , m_videoProxy(proxy)
{ {
#ifdef BUILD_GL #ifdef BUILD_GL
@ -215,10 +217,12 @@ PainterGL::PainterGL(int majorVersion, VideoProxy* proxy, QGLWidget* parent)
mGLES2Context* gl2Backend; mGLES2Context* gl2Backend;
#endif #endif
m_gl->makeCurrent(); m_gl->makeCurrent(m_surface);
m_window = new QOpenGLPaintDevice;
#if defined(_WIN32) && defined(USE_EPOXY) #if defined(_WIN32) && defined(USE_EPOXY)
epoxy_handle_external_wglMakeCurrent(); epoxy_handle_external_wglMakeCurrent();
#endif #endif
int majorVersion = m_gl->format().majorVersion();
QStringList extensions = QString(reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS))).split(' '); QStringList extensions = QString(reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS))).split(' ');
@ -241,13 +245,13 @@ PainterGL::PainterGL(int majorVersion, VideoProxy* proxy, QGLWidget* parent)
#endif #endif
m_backend->swap = [](VideoBackend* v) { m_backend->swap = [](VideoBackend* v) {
PainterGL* painter = static_cast<PainterGL*>(v->user); PainterGL* painter = static_cast<PainterGL*>(v->user);
if (!painter->m_gl->isVisible()) { if (!painter->m_gl->isValid()) {
return; return;
} }
painter->m_gl->swapBuffers(); painter->m_gl->swapBuffers(painter->m_gl->surface());
}; };
m_backend->init(m_backend, reinterpret_cast<WHandle>(m_gl->winId())); m_backend->init(m_backend, 0);
#ifdef BUILD_GLES2 #ifdef BUILD_GLES2
if (m_supportsShaders) { if (m_supportsShaders) {
m_shader.preprocessShader = static_cast<void*>(&reinterpret_cast<mGLES2Context*>(m_backend)->initialShader); m_shader.preprocessShader = static_cast<void*>(&reinterpret_cast<mGLES2Context*>(m_backend)->initialShader);
@ -271,7 +275,7 @@ PainterGL::~PainterGL() {
for (auto item : m_free) { for (auto item : m_free) {
delete[] item; delete[] item;
} }
m_gl->makeCurrent(); m_gl->makeCurrent(m_surface);
#if defined(_WIN32) && defined(USE_EPOXY) #if defined(_WIN32) && defined(USE_EPOXY)
epoxy_handle_external_wglMakeCurrent(); epoxy_handle_external_wglMakeCurrent();
#endif #endif
@ -284,6 +288,7 @@ PainterGL::~PainterGL() {
m_gl->doneCurrent(); m_gl->doneCurrent();
free(m_backend); free(m_backend);
m_backend = nullptr; m_backend = nullptr;
delete m_window;
} }
void PainterGL::setContext(std::shared_ptr<CoreController> context) { void PainterGL::setContext(std::shared_ptr<CoreController> context) {
@ -297,7 +302,7 @@ void PainterGL::resizeContext() {
} }
if (!m_active) { if (!m_active) {
m_gl->makeCurrent(); m_gl->makeCurrent(m_surface);
#if defined(_WIN32) && defined(USE_EPOXY) #if defined(_WIN32) && defined(USE_EPOXY)
epoxy_handle_external_wglMakeCurrent(); epoxy_handle_external_wglMakeCurrent();
#endif #endif
@ -316,11 +321,7 @@ void PainterGL::setMessagePainter(MessagePainter* messagePainter) {
void PainterGL::resize(const QSize& size) { void PainterGL::resize(const QSize& size) {
m_size = size; m_size = size;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) float r = m_surface->devicePixelRatio();
float r = m_gl->devicePixelRatioF();
#else
float r = m_gl->devicePixelRatio();
#endif
m_backend->resized(m_backend, m_size.width() * r, m_size.height() * r); m_backend->resized(m_backend, m_size.width() * r, m_size.height() * r);
if (m_started && !m_active) { if (m_started && !m_active) {
forceDraw(); forceDraw();
@ -345,7 +346,7 @@ void PainterGL::filter(bool filter) {
} }
void PainterGL::start() { void PainterGL::start() {
m_gl->makeCurrent(); m_gl->makeCurrent(m_surface);
#if defined(_WIN32) && defined(USE_EPOXY) #if defined(_WIN32) && defined(USE_EPOXY)
epoxy_handle_external_wglMakeCurrent(); epoxy_handle_external_wglMakeCurrent();
#endif #endif
@ -368,7 +369,7 @@ void PainterGL::draw() {
if (mCoreSyncWaitFrameStart(&m_context->thread()->impl->sync) || !m_queue.isEmpty()) { if (mCoreSyncWaitFrameStart(&m_context->thread()->impl->sync) || !m_queue.isEmpty()) {
dequeue(); dequeue();
mCoreSyncWaitFrameEnd(&m_context->thread()->impl->sync); mCoreSyncWaitFrameEnd(&m_context->thread()->impl->sync);
m_painter.begin(m_gl->context()->device()); m_painter.begin(m_window);
performDraw(); performDraw();
m_painter.end(); m_painter.end();
m_backend->swap(m_backend); m_backend->swap(m_backend);
@ -389,7 +390,7 @@ void PainterGL::draw() {
} }
void PainterGL::forceDraw() { void PainterGL::forceDraw() {
m_painter.begin(m_gl->context()->device()); m_painter.begin(m_window);
performDraw(); performDraw();
m_painter.end(); m_painter.end();
m_backend->swap(m_backend); m_backend->swap(m_backend);
@ -402,7 +403,7 @@ void PainterGL::stop() {
m_backend->clear(m_backend); m_backend->clear(m_backend);
m_backend->swap(m_backend); m_backend->swap(m_backend);
m_gl->doneCurrent(); m_gl->doneCurrent();
m_gl->context()->moveToThread(m_gl->thread()); m_gl->moveToThread(m_surface->thread());
m_context.reset(); m_context.reset();
moveToThread(m_gl->thread()); moveToThread(m_gl->thread());
m_videoProxy->moveToThread(m_gl->thread()); m_videoProxy->moveToThread(m_gl->thread());
@ -474,9 +475,9 @@ void PainterGL::setShaders(struct VDir* dir) {
if (!supportsShaders()) { if (!supportsShaders()) {
return; return;
} }
if (!m_active) {
#ifdef BUILD_GLES2 #ifdef BUILD_GLES2
m_gl->makeCurrent(); if (!m_active) {
m_gl->makeCurrent(m_surface);
#if defined(_WIN32) && defined(USE_EPOXY) #if defined(_WIN32) && defined(USE_EPOXY)
epoxy_handle_external_wglMakeCurrent(); epoxy_handle_external_wglMakeCurrent();
#endif #endif
@ -501,7 +502,7 @@ void PainterGL::clearShaders() {
} }
if (!m_active) { if (!m_active) {
#ifdef BUILD_GLES2 #ifdef BUILD_GLES2
m_gl->makeCurrent(); m_gl->makeCurrent(m_surface);
#if defined(_WIN32) && defined(USE_EPOXY) #if defined(_WIN32) && defined(USE_EPOXY)
epoxy_handle_external_wglMakeCurrent(); epoxy_handle_external_wglMakeCurrent();
#endif #endif

23
src/platform/qt/DisplayGL.h
View File

@ -17,9 +17,10 @@
#endif #endif
#include <QElapsedTimer> #include <QElapsedTimer>
#include <QGLWidget> #include <QOpenGLContext>
#include <QList> #include <QList>
#include <QMouseEvent> #include <QMouseEvent>
#include <QPainter>
#include <QQueue> #include <QQueue>
#include <QThread> #include <QThread>
@ -29,22 +30,12 @@
namespace QGBA { namespace QGBA {
class EmptyGLWidget : public QGLWidget {
public:
EmptyGLWidget(const QGLFormat& format, QWidget* parent) : QGLWidget(format, parent) { setAutoBufferSwap(false); }
protected:
void paintEvent(QPaintEvent* event) override { event->ignore(); }
void resizeEvent(QResizeEvent*) override {}
void mouseMoveEvent(QMouseEvent* event) override { event->ignore(); }
};
class PainterGL; class PainterGL;
class DisplayGL : public Display { class DisplayGL : public Display {
Q_OBJECT Q_OBJECT
public: public:
DisplayGL(const QGLFormat& format, QWidget* parent = nullptr); DisplayGL(const QSurfaceFormat& format, QWidget* parent = nullptr);
~DisplayGL(); ~DisplayGL();
void startDrawing(std::shared_ptr<CoreController>) override; void startDrawing(std::shared_ptr<CoreController>) override;
@ -75,7 +66,7 @@ private:
void resizePainter(); void resizePainter();
bool m_isDrawing = false; bool m_isDrawing = false;
QGLWidget* m_gl; QOpenGLContext* m_gl;
PainterGL* m_painter; PainterGL* m_painter;
QThread* m_drawThread = nullptr; QThread* m_drawThread = nullptr;
std::shared_ptr<CoreController> m_context; std::shared_ptr<CoreController> m_context;
@ -86,7 +77,7 @@ class PainterGL : public QObject {
Q_OBJECT Q_OBJECT
public: public:
PainterGL(int majorVersion, VideoProxy* proxy, QGLWidget* parent); PainterGL(VideoProxy* proxy, QWindow* surface, QOpenGLContext* parent);
~PainterGL(); ~PainterGL();
void setContext(std::shared_ptr<CoreController>); void setContext(std::shared_ptr<CoreController>);
@ -123,7 +114,9 @@ private:
QQueue<uint32_t*> m_queue; QQueue<uint32_t*> m_queue;
QPainter m_painter; QPainter m_painter;
QMutex m_mutex; QMutex m_mutex;
QGLWidget* m_gl; QWindow* m_surface;
QPaintDevice* m_window;
QOpenGLContext* m_gl;
bool m_active = false; bool m_active = false;
bool m_started = false; bool m_started = false;
std::shared_ptr<CoreController> m_context = nullptr; std::shared_ptr<CoreController> m_context = nullptr;

10
src/platform/qt/main.cpp
View File

@ -17,6 +17,10 @@
#include <QLibraryInfo> #include <QLibraryInfo>
#include <QTranslator> #include <QTranslator>
#ifdef BUILD_GLES2
#include <QSurfaceFormat>
#endif
#ifdef QT_STATIC #ifdef QT_STATIC
#include <QtPlugin> #include <QtPlugin>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
@ -65,6 +69,12 @@ int main(int argc, char* argv[]) {
QApplication::setApplicationName(projectName); QApplication::setApplicationName(projectName);
QApplication::setApplicationVersion(projectVersion); QApplication::setApplicationVersion(projectVersion);
#ifdef BUILD_GLES2
QSurfaceFormat format;
format.setVersion(3, 0);
QSurfaceFormat::setDefaultFormat(format);
#endif
GBAApp application(argc, argv, &configController); GBAApp application(argc, argv, &configController);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC