Debug|Unix: Investigating Canvas recreation issues

skyjake · Feb 12, 2014 · e0483c2 · e0483c2
1 parent 071321a
commit e0483c2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/doomsday/client/include/gl/gl_main.h b/doomsday/client/include/gl/gl_main.h
@@ -314,6 +314,8 @@ void GL_CalcLuminance(uint8_t const *buffer, int width, int height, int comps,
     colorpaletteid_t paletteId, float *brightX, float *brightY,
     struct ColorRawf_s *color, float *lumSize);
 
+void DGL_AssertNotInPrimitive(void);
+
 // Console commands.
 D_CMD(UpdateGammaRamp);
 

diff --git a/doomsday/client/src/gl/dgl_draw.cpp b/doomsday/client/src/gl/dgl_draw.cpp
@@ -297,6 +297,11 @@ DENG_EXTERN_C void DGL_Begin(dglprimtype_t mode)
             DGL_QUAD_STRIP ? GL_QUAD_STRIP : GL_QUADS);
 }
 
+void DGL_AssertNotInPrimitive(void)
+{
+    DENG_ASSERT(!inPrim);
+}
+
 #undef DGL_End
 DENG_EXTERN_C void DGL_End(void)
 {

diff --git a/doomsday/client/src/ui/clientwindow.cpp b/doomsday/client/src/ui/clientwindow.cpp
@@ -691,7 +691,11 @@ Canvas &ClientWindow::windowCanvas()
 
 void ClientWindow::drawWindowContent()
 {
+    LIBGUI_ASSERT_GL_OK();
+
     root().draw();
+
+    LIBGUI_ASSERT_GL_OK();
 }
 
 ClientRootWidget &ClientWindow::root()
@@ -851,6 +855,7 @@ bool ClientWindow::setDefaultGLFormat() // static
         fmt.setStereo(true);
     }
 
+    /*
     if(CommandLine_Exists("-novsync") || !Con_GetByte("vid-vsync"))
     {
         fmt.setSwapInterval(0); // vsync off
@@ -861,6 +866,7 @@ bool ClientWindow::setDefaultGLFormat() // static
         fmt.setSwapInterval(1);
         LOG_GL_VERBOSE("Vertical sync on");
     }
+    */
 
     // The value of the "vid-fsaa" variable is written to this settings
     // key when the value of the variable changes.

diff --git a/doomsday/libappfw/src/vrwindowtransform.cpp b/doomsday/libappfw/src/vrwindowtransform.cpp
@@ -113,7 +113,9 @@ DENG2_PIMPL(VRWindowTransform)
 
     void drawContent() const
     {
+        LIBGUI_ASSERT_GL_OK();
         self.window().drawWindowContent();
+        LIBGUI_ASSERT_GL_OK();
     }
 
     /**
@@ -337,6 +339,8 @@ DENG2_PIMPL(VRWindowTransform)
         // Restore default VR dynamic parameters
         target().unsetActiveRect(true);
         vrCfg.setCurrentEye(VRConfig::NeitherEye);
+
+        LIBGUI_ASSERT_GL_OK();
     }
 };