From c9244a03c701fa8e274c8500795fe1f6c1b27830 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 23 May 2015 02:25:21 -0300 Subject: 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. --- src/citra_qt/bootmanager.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index ea46bb1da..72b55e94d 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(); } -- cgit v1.2.3