X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glxtrace.py;h=27593199eee08300cc6e25444adccf7eb1b906c5;hb=7fe1dc57d2249236b83aa1a78001a9245d6e1681;hp=1b9aeac76ea670c5f5245c130bca00b37ccfd95f;hpb=6fa64d06f3eb475017d292b96535985c59f9778e;p=apitrace

diff --git a/glxtrace.py b/glxtrace.py
index 1b9aeac..2759319 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,14 @@
 ##########################################################################/
 
 
-from base import *
-from glapi import glapi
-import trace
+"""GLX tracing generator."""
 
 
-glxapi = API("GLX")
+from glxapi import glxapi
+from trace import Tracer
 
-PROC = Opaque("__GLXextFuncPtr")
 
-glxapi.add_functions(glapi.functions)
-glxapi.add_functions([
-    Function(PROC, "glXGetProcAddressARB", [(Alias("const GLubyte *", String), "procName")]),
-    Function(PROC, "glXGetProcAddress", [(Alias("const GLubyte *", String), "procName")]),
-])
-
-
-class GlxTracer(trace.Tracer):
+class GlxTracer(Tracer):
 
     def get_function_address(self, function):
         if function.name.startswith("glXGetProcAddress"):
@@ -49,7 +40,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 +62,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