Handle blobs better.

[apitrace] / glxtrace.py

diff --git a/glxtrace.py b/glxtrace.py
index 2fa5ae50b85d3c216005d58a5c4409a97defe7c7..67ce5524fbacdd3247e93bf6ccf0a7896b7efe05 100644 (file)
--- 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 base 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,)
 
@@ -71,14 +59,11 @@ if __name__ == '__main__':
     print '#include <stdlib.h>'
     print '#include <string.h>'
     print '#include <dlfcn.h>'
-    print '#include <X11/Xlib.h>'
-    print '#include <GL/gl.h>'
-    print '#include <GL/glext.h>'
-    print '#include <GL/glx.h>'
-    print '#include <GL/glxext.h>'
     print
-    print '#include "log.hpp"'
-    print '#include "glhelpers.hpp"'
+    print '#include "glimports.hpp"'
+    print
+    print '#include "trace_write.hpp"'
+    print '#include "glsize.hpp"'
     print
     print 'extern "C" {'
     print