diff options
| author | 2014-04-30 17:10:38 -0700 | |
|---|---|---|
| committer | 2014-04-30 17:10:38 -0700 | |
| commit | 3dad4e3b5cf0e5cc0c52fa28fb055ed98f912915 (patch) | |
| tree | 8c941aaa7d9f3528ae9875f5bdd00648f0a2d03c /src | |
| parent | OpenGL 3+ on OSX with GLFW (diff) | |
| download | yuzu-3dad4e3b5cf0e5cc0c52fa28fb055ed98f912915.tar.gz yuzu-3dad4e3b5cf0e5cc0c52fa28fb055ed98f912915.tar.xz yuzu-3dad4e3b5cf0e5cc0c52fa28fb055ed98f912915.zip | |
Sets OGL version for Qt; will only work with Qt5
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 31958ac28..52b39eb27 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -73,11 +73,10 @@ void EmuThread::Stop() | |||
| 73 | class GGLWidgetInternal : public QGLWidget | 73 | class GGLWidgetInternal : public QGLWidget |
| 74 | { | 74 | { |
| 75 | public: | 75 | public: |
| 76 | GGLWidgetInternal(GRenderWindow* parent) : QGLWidget(parent) | 76 | GGLWidgetInternal(QGLFormat fmt, GRenderWindow* parent) : QGLWidget(parent) |
| 77 | { | 77 | { |
| 78 | setAutoBufferSwap(false); | 78 | doneCurrent(); |
| 79 | doneCurrent(); | 79 | parent_ = parent; |
| 80 | parent_ = parent; | ||
| 81 | } | 80 | } |
| 82 | 81 | ||
| 83 | void paintEvent(QPaintEvent* ev) | 82 | void paintEvent(QPaintEvent* ev) |
| @@ -103,8 +102,13 @@ EmuThread& GRenderWindow::GetEmuThread() | |||
| 103 | GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this) | 102 | GRenderWindow::GRenderWindow(QWidget* parent) : QWidget(parent), emu_thread(this) |
| 104 | { | 103 | { |
| 105 | // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose | 104 | // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground, WA_DontShowOnScreen, WA_DeleteOnClose |
| 106 | 105 | QGLFormat fmt; | |
| 107 | child = new GGLWidgetInternal(this); | 106 | fmt.setProfile(QGLFormat::CoreProfile); |
| 107 | fmt.setVersion(4,1); | ||
| 108 | fmt.setSampleBuffers(true); | ||
| 109 | fmt.setSamples(4); | ||
| 110 | |||
| 111 | child = new GGLWidgetInternal(fmt, this); | ||
| 108 | QBoxLayout* layout = new QHBoxLayout(this); | 112 | QBoxLayout* layout = new QHBoxLayout(this); |
| 109 | resize(VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); | 113 | resize(VideoCore::kScreenTopWidth, VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight); |
| 110 | layout->addWidget(child); | 114 | layout->addWidget(child); |