aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/citra_qt
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-05-23 02:25:21 -0300
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-05-23 02:27:27 -0300
commitc9244a03c701fa8e274c8500795fe1f6c1b27830 (patch)
tree924e2caaa867dfc2f9a63580b862705a8c6ac274 /src/citra_qt
parenta7946f9027a87da93cd76ec46d54cadf4203b082 (diff)
Qt: Silence a bogus warning printed when using the debug runtime
The Qt debug runtime prints a bogus warning on the console if you haven't called makeCurrent since the last time you called swapBuffers. This presumably means something if you're using QGLWidget the "regular" way, but in our multi-threaded use case is harmless since we never call doneCurrent in the rendering thread.
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/bootmanager.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index ea46bb1d..72b55e94 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -138,7 +138,13 @@ void GRenderWindow::moveContext()
void GRenderWindow::SwapBuffers()
{
- // MakeCurrent is already called in renderer_opengl
+#if !defined(QT_NO_DEBUG)
+ // Qt debug runtime prints a bogus warning on the console if you haven't called makeCurrent
+ // since the last time you called swapBuffers. This presumably means something if you're using
+ // QGLWidget the "regular" way, but in our multi-threaded use case is harmless since we never
+ // call doneCurrent in this thread.
+ child->makeCurrent();
+#endif
child->swapBuffers();
}