X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fglretrace_glx.cpp;h=fe88a59406ab285c0ace7327077bbbe4f929406e;hb=712cc1db47e56a1032dc72d4209ffc9054ec54e4;hp=4e4209600a0487f8238c5a5d3ab843ad88953d9e;hpb=422f2ea7a960de49a9d90e0aebd41b7e18ceaea6;p=apitrace

diff --git a/retrace/glretrace_glx.cpp b/retrace/glretrace_glx.cpp
index 4e42096..fe88a59 100644
--- a/retrace/glretrace_glx.cpp
+++ b/retrace/glretrace_glx.cpp
@@ -112,9 +112,13 @@ static void retrace_glXDestroyContext(trace::Call &call) {
 }
 
 static void retrace_glXSwapBuffers(trace::Call &call) {
+    glws::Drawable *drawable = getDrawable(call.arg(1).toUInt());
+
     frame_complete(call);
     if (retrace::doubleBuffer) {
-        currentDrawable->swapBuffers();
+        if (drawable) {
+            drawable->swapBuffers();
+        }
     } else {
         glFlush();
     }
@@ -129,37 +133,14 @@ static void retrace_glXCreateNewContext(trace::Call &call) {
 }
 
 static void retrace_glXCreatePbuffer(trace::Call &call) {
-    int width = 0;
-    int height = 0;
-
-    const trace::Array *attrib_list = dynamic_cast<const trace::Array *>(&call.arg(2));
-    if (attrib_list) {
-        for (size_t i = 0; i + 1 < attrib_list->values.size(); i += 2) {
-            int param = attrib_list->values[i]->toSInt();
-            if (param == 0) {
-                break;
-            }
-
-            int value = attrib_list->values[i + 1]->toSInt();
-
-            switch (param) {
-            case GLX_PBUFFER_WIDTH:
-                width = value;
-                break;
-            case GLX_PBUFFER_HEIGHT:
-                height = value;
-                break;
-            }
-        }
-    }
+    const trace::Value *attrib_list = dynamic_cast<const trace::Array *>(&call.arg(2));
+    int width = glretrace::parseAttrib(attrib_list, GLX_PBUFFER_WIDTH, 0);
+    int height = glretrace::parseAttrib(attrib_list, GLX_PBUFFER_HEIGHT, 0);
 
     unsigned long long orig_drawable = call.ret->toUInt();
 
-    glws::Drawable *drawable = glretrace::createDrawable();
+    glws::Drawable *drawable = glretrace::createPbuffer(width, height);
     
-    drawable->resize(width, height);
-    drawable->show();
-
     drawable_map[orig_drawable] = drawable;
 }
 
@@ -184,7 +165,7 @@ const retrace::Entry glretrace::glx_callbacks[] = {
     //{"glXBindChannelToWindowSGIX", &retrace_glXBindChannelToWindowSGIX},
     //{"glXBindSwapBarrierNV", &retrace_glXBindSwapBarrierNV},
     //{"glXBindSwapBarrierSGIX", &retrace_glXBindSwapBarrierSGIX},
-    //{"glXBindTexImageEXT", &retrace_glXBindTexImageEXT},
+    {"glXBindTexImageEXT", &retrace::ignore},
     //{"glXChannelRectSGIX", &retrace_glXChannelRectSGIX},
     //{"glXChannelRectSyncSGIX", &retrace_glXChannelRectSyncSGIX},
     {"glXChooseFBConfig", &retrace::ignore},
@@ -201,14 +182,14 @@ const retrace::Entry glretrace::glx_callbacks[] = {
     //{"glXCreateGLXPixmapWithConfigSGIX", &retrace_glXCreateGLXPixmapWithConfigSGIX},
     {"glXCreateNewContext", &retrace_glXCreateNewContext},
     {"glXCreatePbuffer", &retrace_glXCreatePbuffer},
-    //{"glXCreatePixmap", &retrace_glXCreatePixmap},
+    {"glXCreatePixmap", &retrace::ignore},
     //{"glXCreateWindow", &retrace_glXCreateWindow},
     //{"glXCushionSGI", &retrace_glXCushionSGI},
     {"glXDestroyContext", &retrace_glXDestroyContext},
     //{"glXDestroyGLXPbufferSGIX", &retrace_glXDestroyGLXPbufferSGIX},
     //{"glXDestroyGLXPixmap", &retrace_glXDestroyGLXPixmap},
     {"glXDestroyPbuffer", &retrace_glXDestroyPbuffer},
-    //{"glXDestroyPixmap", &retrace_glXDestroyPixmap},
+    {"glXDestroyPixmap", &retrace::ignore},
     //{"glXDestroyWindow", &retrace_glXDestroyWindow},
     //{"glXFreeContextEXT", &retrace_glXFreeContextEXT},
     {"glXGetAGPOffsetMESA", &retrace::ignore},
@@ -230,6 +211,7 @@ const retrace::Entry glretrace::glx_callbacks[] = {
     {"glXGetProcAddress", &retrace::ignore},
     {"glXGetSelectedEvent", &retrace::ignore},
     {"glXGetSelectedEventSGIX", &retrace::ignore},
+    {"glXGetSwapIntervalMESA", &retrace::ignore},
     {"glXGetSyncValuesOML", &retrace::ignore},
     {"glXGetVideoSyncSGI", &retrace::ignore},
     {"glXGetVisualFromFBConfig", &retrace::ignore},
@@ -256,7 +238,7 @@ const retrace::Entry glretrace::glx_callbacks[] = {
     {"glXQuerySwapGroupNV", &retrace::ignore},
     {"glXQueryVersion", &retrace::ignore},
     //{"glXReleaseBuffersMESA", &retrace_glXReleaseBuffersMESA},
-    //{"glXReleaseTexImageEXT", &retrace_glXReleaseTexImageEXT},
+    {"glXReleaseTexImageEXT", &retrace::ignore},
     //{"glXResetFrameCountNV", &retrace_glXResetFrameCountNV},
     //{"glXSelectEvent", &retrace_glXSelectEvent},
     //{"glXSelectEventSGIX", &retrace_glXSelectEventSGIX},