From bd731e82662fa9193bd997e31774990404821830 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Wed, 15 Oct 2014 02:38:43 -0700 Subject: [PATCH] Remove unneeded GL context code --- src/platform/qt/Display.cpp | 9 +++------ src/platform/qt/Display.h | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/platform/qt/Display.cpp b/src/platform/qt/Display.cpp index 3b477c0e9..71a3c3fb1 100644 --- a/src/platform/qt/Display.cpp +++ b/src/platform/qt/Display.cpp @@ -38,7 +38,6 @@ void Display::startDrawing(const uint32_t* buffer, GBAThread* thread) { } 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 @@ void Display::resizeEvent(QResizeEvent* event) { } } -Painter::Painter(Display* parent) { +Painter::Painter(Display* parent) + : m_gl(parent) +{ m_size = parent->size(); } @@ -80,10 +81,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_size = size; m_gl->makeCurrent(); diff --git a/src/platform/qt/Display.h b/src/platform/qt/Display.h index 2513e4053..4ad3ca9f6 100644 --- a/src/platform/qt/Display.h +++ b/src/platform/qt/Display.h @@ -38,7 +38,6 @@ public: void setContext(GBAThread*); void setBacking(const uint32_t*); - void setGLContext(QGLWidget*); public slots: void draw();