Create contexts with DEBUG_BIT when not benchmarking.

[apitrace] / glretrace_main.cpp

diff --git a/glretrace_main.cpp b/glretrace_main.cpp
index fb98b615aa9625dcc6159a4126041b6982a31f0f..4e4b8aee8da4cbf942dc4ac8ca1dd3ddb6805d2d 100644 (file)
--- a/glretrace_main.cpp
+++ b/glretrace_main.cpp
@@ -38,7 +38,6 @@ namespace glretrace {
 bool double_buffer = true;
 bool insideGlBeginEnd = false;
 Trace::Parser parser;
-glws::WindowSystem *ws = NULL;
 glws::Visual *visual = NULL;
 glws::Drawable *drawable = NULL;
 glws::Context *context = NULL;
@@ -227,7 +226,7 @@ static void display(void) {
     }
 
     if (wait) {
-        while (ws->processEvents()) {}
+        while (glws::processEvents()) {}
     } else {
         exit(0);
     }
@@ -267,6 +266,7 @@ int main(int argc, char **argv)
         } else if (!strcmp(arg, "-b")) {
             benchmark = true;
             retrace::verbosity = -1;
+            glws::debug = false;
         } else if (!strcmp(arg, "-c")) {
             compare_prefix = argv[++i];
             if (snapshot_frequency == FREQUENCY_NEVER) {
@@ -317,8 +317,8 @@ int main(int argc, char **argv)
         }
     }
 
-    ws = glws::createNativeWindowSystem();
-    visual = ws->createVisual(double_buffer);
+    glws::init();
+    visual = glws::createVisual(double_buffer);
 
     for ( ; i < argc; ++i) {
         if (!parser.open(argv[i])) {
@@ -330,6 +330,9 @@ int main(int argc, char **argv)
 
         parser.close();
     }
+    
+    delete visual;
+    glws::cleanup();
 
     return 0;
 }