all repos — mgba @ bd731e82662fa9193bd997e31774990404821830

mGBA Game Boy Advance Emulator

Remove unneeded GL context code
Jeffrey Pfau jeffrey@endrift.com
Wed, 15 Oct 2014 02:38:43 -0700
commit

bd731e82662fa9193bd997e31774990404821830

parent

1ef3f4256faabc8a7caa029b1c21ea52bba4879d

2 files changed, 3 insertions(+), 7 deletions(-)

jump to
M src/platform/qt/Display.cppsrc/platform/qt/Display.cpp

@@ -38,7 +38,6 @@ return;

} m_drawThread = new QThread(this); m_painter = new Painter(this); - m_painter->setGLContext(this); m_painter->setContext(thread); m_painter->setBacking(buffer); m_painter->moveToThread(m_drawThread);

@@ -68,7 +67,9 @@ QMetaObject::invokeMethod(m_painter, "resize", Qt::BlockingQueuedConnection, Q_ARG(QSize, event->size()));

} } -Painter::Painter(Display* parent) { +Painter::Painter(Display* parent) + : m_gl(parent) +{ m_size = parent->size(); }

@@ -78,10 +79,6 @@ }

void Painter::setBacking(const uint32_t* backing) { m_backing = backing; -} - -void Painter::setGLContext(QGLWidget* context) { - m_gl = context; } void Painter::resize(const QSize& size) {
M src/platform/qt/Display.hsrc/platform/qt/Display.h

@@ -38,7 +38,6 @@ Painter(Display* parent);

void setContext(GBAThread*); void setBacking(const uint32_t*); - void setGLContext(QGLWidget*); public slots: void draw();