From 3689f22598ffa39bd299191897e988d1b32fadbb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Wed, 12 Jun 2013 23:03:57 +0100
Subject: [PATCH] gltrace: Also use dlopen.hpp for glxtrace.

---
 wrappers/egltrace.py |  2 +-
 wrappers/glxtrace.py | 23 +----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/wrappers/egltrace.py b/wrappers/egltrace.py
index 2d9af1b..11d3ad2 100644
--- a/wrappers/egltrace.py
+++ b/wrappers/egltrace.py
@@ -100,7 +100,6 @@ class EglTracer(GlTracer):
 if __name__ == '__main__':
     print '#include <stdlib.h>'
     print '#include <string.h>'
-    print '#include "dlopen.hpp"'
     print
     print '#include "trace_writer_local.hpp"'
     print
@@ -108,6 +107,7 @@ if __name__ == '__main__':
     print '#define GL_GLEXT_PROTOTYPES'
     print '#define EGL_EGLEXT_PROTOTYPES'
     print
+    print '#include "dlopen.hpp"'
     print '#include "glproc.hpp"'
     print '#include "glsize.hpp"'
     print '#include "eglsize.hpp"'
diff --git a/wrappers/glxtrace.py b/wrappers/glxtrace.py
index 568eb1a..e9c43a9 100644
--- a/wrappers/glxtrace.py
+++ b/wrappers/glxtrace.py
@@ -160,14 +160,13 @@ if __name__ == '__main__':
     print '#include <stdlib.h>'
     print '#include <string.h>'
     print
-    print '#include <dlfcn.h>'
-    print
     print '#include "trace_writer_local.hpp"'
     print
     print '// To validate our prototypes'
     print '#define GL_GLEXT_PROTOTYPES'
     print '#define GLX_GLXEXT_PROTOTYPES'
     print
+    print '#include "dlopen.hpp"'
     print '#include "glproc.hpp"'
     print '#include "glsize.hpp"'
     print
@@ -183,26 +182,6 @@ if __name__ == '__main__':
     print r'''
 
 
-/*
- * Invoke the true dlopen() function.
- */
-static void *_dlopen(const char *filename, int flag)
-{
-    typedef void * (*PFN_DLOPEN)(const char *, int);
-    static PFN_DLOPEN dlopen_ptr = NULL;
-
-    if (!dlopen_ptr) {
-        dlopen_ptr = (PFN_DLOPEN)dlsym(RTLD_NEXT, "dlopen");
-        if (!dlopen_ptr) {
-            os::log("apitrace: error: dlsym(RTLD_NEXT, \"dlopen\") failed\n");
-            return NULL;
-        }
-    }
-
-    return dlopen_ptr(filename, flag);
-}
-
-
 /*
  * Several applications, such as Quake3, use dlopen("libGL.so.1"), but
  * LD_PRELOAD does not intercept symbols obtained via dlopen/dlsym, therefore
-- 
2.43.0