Synchronize X and GL on windows resizes.

[apitrace] / glws_glx.cpp

diff --git a/glws_glx.cpp b/glws_glx.cpp
index 7d286a526f8cb7dd96625c9319fbded9e0b07391..661e77db4ae1b0a874329fd909126baa58433ade 100644 (file)
--- a/glws_glx.cpp
+++ b/glws_glx.cpp
@@ -63,8 +63,10 @@ public:
     
     void
     resize(unsigned w, unsigned h) {
+        glXWaitGL();
         Drawable::resize(w, h);
         XResizeWindow(display, window, w, h);
+        glXWaitX();
     }
 
     void swapBuffers(void) {
@@ -196,7 +198,7 @@ public:
     makeCurrent(Drawable *drawable, Context *context)
     {
         if (!drawable || !context) {
-            return glXMakeCurrent(display, NULL, NULL);
+            return glXMakeCurrent(display, None, NULL);
         } else {
             GlxDrawable *glxDrawable = dynamic_cast<GlxDrawable *>(drawable);
             GlxContext *glxContext = dynamic_cast<GlxContext *>(context);