X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glretrace_cgl.cpp;h=63b94b466d6f2804a8663f3effb67f405eeabeb4;hb=67964385bd2abb065787c52625ed19dbe08f2bf8;hp=411706b664f06dff7ca681dd9e879b1255278851;hpb=2741ed8b85842cf5f08fe6dff8d4ae5626434046;p=apitrace

diff --git a/glretrace_cgl.cpp b/glretrace_cgl.cpp
index 411706b..63b94b4 100644
--- a/glretrace_cgl.cpp
+++ b/glretrace_cgl.cpp
@@ -53,7 +53,7 @@ getDrawable(unsigned long drawable_id) {
     DrawableMap::const_iterator it;
     it = drawable_map.find(drawable_id);
     if (it == drawable_map.end()) {
-        return (drawable_map[drawable_id] = ws->createDrawable(visual));
+        return (drawable_map[drawable_id] = glws::createDrawable(visual[glretrace::defaultProfile]));
     }
 
     return it->second;
@@ -70,7 +70,7 @@ getContext(unsigned long long ctx) {
     it = context_map.find(ctx);
     if (it == context_map.end()) {
         glws::Context *context;
-        context_map[ctx] = context = ws->createContext(visual, sharedContext);
+        context_map[ctx] = context = glws::createContext(visual[glretrace::defaultProfile], sharedContext, glretrace::defaultProfile);
         if (!sharedContext) {
             sharedContext = context;
         }
@@ -81,13 +81,13 @@ getContext(unsigned long long ctx) {
 }
 
 
-static void retrace_CGLSetCurrentContext(Trace::Call &call) {
+static void retrace_CGLSetCurrentContext(trace::Call &call) {
     unsigned long long ctx = call.arg(0).toUIntPtr();
 
     glws::Drawable *new_drawable = getDrawable(ctx);
     glws::Context *new_context = getContext(ctx);
 
-    bool result = ws->makeCurrent(new_drawable, new_context);
+    bool result = glws::makeCurrent(new_drawable, new_context);
 
     if (new_drawable && new_context && result) {
         drawable = new_drawable;
@@ -99,7 +99,7 @@ static void retrace_CGLSetCurrentContext(Trace::Call &call) {
 }
 
 
-static void retrace_CGLFlushDrawable(Trace::Call &call) {
+static void retrace_CGLFlushDrawable(trace::Call &call) {
     if (drawable && context) {
         if (double_buffer) {
             drawable->swapBuffers();
@@ -107,13 +107,18 @@ static void retrace_CGLFlushDrawable(Trace::Call &call) {
             glFlush();
         }
 
-        frame_complete(call.no);
+        frame_complete(call);
     }
 }
 
 
 const retrace::Entry glretrace::cgl_callbacks[] = {
     {"CGLSetCurrentContext", &retrace_CGLSetCurrentContext},
+    {"CGLGetCurrentContext", &retrace::ignore},
+    {"CGLEnable", &retrace::ignore},
+    {"CGLDisable", &retrace::ignore},
+    {"CGLSetParameter", &retrace::ignore},
+    {"CGLGetParameter", &retrace::ignore},
     {"CGLFlushDrawable", &retrace_CGLFlushDrawable},
     {NULL, NULL},
 };