Merge branch 'trace-threads'

[apitrace] / egltrace.py

diff --git a/egltrace.py b/egltrace.py
index 994c1ee88a0750e5d29fa1d5c823a9f7f462efa6..8fa313a2117b37a5d4c4298b62fbffa90f6a7b59 100644 (file)
--- a/egltrace.py
+++ b/egltrace.py
@@ -76,7 +76,7 @@ if __name__ == '__main__':
     print '#include <string.h>'
     print '#include <dlfcn.h>'
     print
-    print '#include "trace_writer.hpp"'
+    print '#include "trace_writer_local.hpp"'
     print
     print '// To validate our prototypes'
     print '#define GL_GLEXT_PROTOTYPES'
@@ -110,30 +110,3 @@ if __name__ == '__main__':
     print '    return procPtr;'
     print '}'
     print
-    print r'''
-
-/*
- * Lookup a EGL or GLES symbol
- */
-void * __libegl_sym(const char *symbol, bool pub)
-{
-    void *proc;
-
-    /*
-     * Public symbols are EGL core functions and those defined in dekstop GL
-     * ABI.  Troubles come from the latter.
-     */
-    if (pub) {
-        proc = dlsym(RTLD_NEXT, symbol);
-        if (!proc && symbol[0] == 'g' && symbol[1] == 'l')
-            proc = (void *) __eglGetProcAddress(symbol);
-    }
-    else {
-        proc = (void *) __eglGetProcAddress(symbol);
-        if (!proc && symbol[0] == 'g' && symbol[1] == 'l')
-            proc = dlsym(RTLD_NEXT, symbol);
-    }
-
-    return proc;
-}
-'''