GL|Unix: Assert GL context activate with Qt

skyjake · Apr 13, 2012 · 8cb4225 · 8cb4225
1 parent 52140fb
commit 8cb4225
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/doomsday/engine/portable/src/gl_main.c b/doomsday/engine/portable/src/gl_main.c
@@ -185,15 +185,16 @@ boolean GL_IsInited(void)
     return initGLOk;
 }
 
+#if defined(WIN32) || defined(MACOSX)
 void GL_AssertContextActive(void)
 {
-#ifdef MACOSX
-    assert(CGLGetCurrentContext() != 0);
-#endif
 #ifdef WIN32
     assert(wglGetCurrentContext() != 0);
+#else
+    assert(CGLGetCurrentContext() != 0);
 #endif
 }
+#endif
 
 /**
  * Swaps buffers / blits the back buffer to the front.

diff --git a/doomsday/engine/portable/src/window.cpp b/doomsday/engine/portable/src/window.cpp
@@ -1314,6 +1314,15 @@ void Window_UpdateCanvasFormat(Window* wnd)
     wnd->needRecreateCanvas = true;
 }
 
+#if defined(UNIX) && !defined(MACOSX)
+void GL_AssertContextActive(void)
+{
+    Window* wnd = Window_Main();
+    if(wnd->type == WT_CONSOLE) return;
+    assert(QGLContext::currentContext() != 0);
+}
+#endif
+
 void Window_GLActivate(Window* wnd)
 {
     if(wnd->type == WT_CONSOLE) return;