X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxtrace.py;h=14aca2a969c707384c7d5dca467ddd54d83d5ad5;hb=c5d265c670467c24c9d154a129dc4b1dfadd5de5;hp=38bac452f9bca7def38c7893b8930c9f56dd08f0;hpb=9796b8463dc518eb0c6cf92b4daf92d080a6a896;p=apitrace

diff --git a/glxtrace.py b/glxtrace.py
index 38bac45..14aca2a 100644
--- a/glxtrace.py
+++ b/glxtrace.py
@@ -1,6 +1,6 @@
 ##########################################################################
 #
-# Copyright 2008-2009 VMware, Inc.
+# Copyright 2008-2010 VMware, Inc.
 # All Rights Reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,23 +24,11 @@
 ##########################################################################/
 
 
-from stdapi import *
-from glapi import glapi
-import trace
+from glxapi import glxapi
+from trace import Tracer
 
 
-glxapi = API("GLX")
-
-PROC = Opaque("__GLXextFuncPtr")
-
-glxapi.add_functions(glapi.functions)
-glxapi.add_functions([
-    Function(PROC, "glXGetProcAddressARB", [(Alias("const GLubyte *", CString), "procName")]),
-    Function(PROC, "glXGetProcAddress", [(Alias("const GLubyte *", CString), "procName")]),
-])
-
-
-class GlxTracer(trace.Tracer):
+class GlxTracer(Tracer):
 
     def get_function_address(self, function):
         if function.name.startswith("glXGetProcAddress"):
@@ -49,7 +37,7 @@ class GlxTracer(trace.Tracer):
             print '    if (!pglXGetProcAddress) {'
             print '        pglXGetProcAddress = (PglXGetProcAddress)dlsym(RTLD_NEXT, "glXGetProcAddress");'
             print '        if (!pglXGetProcAddress)'
-            print '            Log::Abort();'
+            print '            Trace::Abort();'
             print '    }'
             return 'pglXGetProcAddress((const GLubyte *)"%s")' % (function.name,)
 
@@ -73,12 +61,12 @@ if __name__ == '__main__':
     print '#include <dlfcn.h>'
     print '#include <X11/Xlib.h>'
     print '#include <GL/gl.h>'
-    print '#include <GL/glext.h>'
+    print '#include "glext.h"'
     print '#include <GL/glx.h>'
-    print '#include <GL/glxext.h>'
+    print '#include "glxext.h"'
     print
-    print '#include "log.hpp"'
-    print '#include "glhelpers.hpp"'
+    print '#include "trace_write.hpp"'
+    print '#include "glsize.hpp"'
     print
     print 'extern "C" {'
     print