Use skiplist-based FastCallSet within trace::CallSet

[apitrace] / retrace / glretrace_ws.cpp

diff --git a/retrace/glretrace_ws.cpp b/retrace/glretrace_ws.cpp
index 66ef10534cdc00d2dad79309ac9dd4688387d2d7..ac03fcc97de6d56390f807a3b1661e6571d489c1 100644 (file)
--- a/retrace/glretrace_ws.cpp
+++ b/retrace/glretrace_ws.cpp
@@ -41,8 +41,6 @@
 namespace glretrace {
 
 
-
-
 static glws::Visual *
 visuals[glws::PROFILE_MAX];
 
@@ -52,6 +50,10 @@ getVisual(glws::Profile profile) {
     glws::Visual * & visual = visuals[profile];
     if (!visual) {
         visual = glws::createVisual(retrace::doubleBuffer, profile);
+        if (!visual) {
+            std::cerr << "error: failed to create OpenGL visual\n";
+            exit(1);
+        }
     }
     return visual;
 }
@@ -68,29 +70,42 @@ getDefaultProfile(void)
 }
 
 
-glws::Drawable *
-createDrawable(glws::Profile profile) {
-    glws::Drawable *draw = glws::createDrawable(getVisual(profile));
+static glws::Drawable *
+createDrawableHelper(glws::Profile profile, int width = 32, int height = 32, bool pbuffer = false) {
+    glws::Visual *visual = getVisual(profile);
+    glws::Drawable *draw = glws::createDrawable(visual, width, height, pbuffer);
     if (!draw) {
         std::cerr << "error: failed to create OpenGL drawable\n";
         exit(1);
-        return NULL;
     }
 
     return draw;
 }
 
 
+glws::Drawable *
+createDrawable(glws::Profile profile) {
+    return createDrawableHelper(profile);
+}
+
+
 glws::Drawable *
 createDrawable(void) {
-    return glretrace::createDrawable(getDefaultProfile());
+    return createDrawable(getDefaultProfile());
+}
+
+
+glws::Drawable *
+createPbuffer(int width, int height) {
+    return createDrawableHelper(getDefaultProfile(), width, height, true);
 }
 
 
 Context *
 createContext(Context *shareContext, glws::Profile profile) {
+    glws::Visual *visual = getVisual(profile);
     glws::Context *shareWsContext = shareContext ? shareContext->wsContext : NULL;
-    glws::Context *ctx = glws::createContext(getVisual(profile), shareWsContext, profile, retrace::debug);
+    glws::Context *ctx = glws::createContext(visual, shareWsContext, profile, retrace::debug);
     if (!ctx) {
         std::cerr << "error: failed to create OpenGL context\n";
         exit(1);
@@ -107,14 +122,23 @@ createContext(Context *shareContext) {
 }
 
 
-typedef Context * CurrentData;
-static os::thread_specific_ptr<CurrentData> currentData;
+Context::~Context()
+{
+    //assert(this != getCurrentContext());
+    if (this != getCurrentContext()) {
+        delete wsContext;
+    }
+}
+
+
+static thread_specific Context *
+currentContextPtr;
 
 
 bool
 makeCurrent(trace::Call &call, glws::Drawable *drawable, Context *context)
 {
-    Context *currentContext = getCurrentContext();
+    Context *currentContext = currentContextPtr;
     glws::Drawable *currentDrawable = currentContext ? currentContext->drawable : NULL;
 
     if (drawable == currentDrawable && context == currentContext) {
@@ -138,26 +162,15 @@ makeCurrent(trace::Call &call, glws::Drawable *drawable, Context *context)
         return false;
     }
 
-    if (currentContext) {
-        currentContext->drawable = NULL;
-    }
-
-    CurrentData *currentDataPtr = currentData.get();
-    if (!currentDataPtr) {
-        currentDataPtr = new CurrentData;
-        currentData.reset(currentDataPtr);
-    }
+    currentContextPtr = context;
 
     if (drawable && context) {
         context->drawable = drawable;
-        *currentData = context;
         
         if (!context->used) {
             initContext();
             context->used = true;
         }
-    } else {
-        *currentData = NULL;
     }
 
     return true;
@@ -166,16 +179,10 @@ makeCurrent(trace::Call &call, glws::Drawable *drawable, Context *context)
 
 Context *
 getCurrentContext(void) {
-    CurrentData *currentDataPtr = currentData.get();
-    if (!currentDataPtr) {
-        return NULL;
-    }
-    return *currentDataPtr;
+    return currentContextPtr;
 }
 
 
-
-
 /**
  * Grow the current drawble.
  *
@@ -192,6 +199,10 @@ updateDrawable(int width, int height) {
     glws::Drawable *currentDrawable = currentContext->drawable;
     assert(currentDrawable);
 
+    if (currentDrawable->pbuffer) {
+        return;
+    }
+
     if (currentDrawable->visible &&
         width  <= currentDrawable->width &&
         height <= currentDrawable->height) {