Mesa (master): Remove Bluegene/L wrappers

Emil Velikov evelikov at kemper.freedesktop.org
Sat Sep 27 14:24:00 UTC 2014


Module: Mesa
Branch: master
Commit: 5ef6eb4654714aacf338a6c9cb767e3c2c59a44f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ef6eb4654714aacf338a6c9cb767e3c2c59a44f

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Thu Sep 25 15:26:13 2014 +0100

Remove Bluegene/L wrappers

Added back in 2009, with osmesa/GLU in mind. Unlikely to be working
any more since the removal of the static makefiles.

Cc: Brian Paul <brianp at vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/main/compiler.h |    2 +-
 src/mesa/main/dlopen.h   |   12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 185c911..34671dc 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -150,7 +150,7 @@ extern "C" {
 #elif defined(__APPLE__)
 #include <CoreFoundation/CFByteOrder.h>
 #define CPU_TO_LE32( x )	CFSwapInt32HostToLittle( x )
-#elif (defined(_AIX) || defined(__blrts))
+#elif (defined(_AIX))
 static inline GLuint CPU_TO_LE32(GLuint x)
 {
    return (((x & 0x000000ff) << 24) |
diff --git a/src/mesa/main/dlopen.h b/src/mesa/main/dlopen.h
index 3754ec1..1e77849 100644
--- a/src/mesa/main/dlopen.h
+++ b/src/mesa/main/dlopen.h
@@ -47,9 +47,7 @@ typedef void (*GenericFunc)(void);
 static inline void *
 _mesa_dlopen(const char *libname, int flags)
 {
-#if defined(__blrts)
-   return NULL;
-#elif defined(HAVE_DLOPEN)
+#if defined(HAVE_DLOPEN)
    flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
    return dlopen(libname, flags);
 #elif defined(__MINGW32__)
@@ -71,9 +69,7 @@ _mesa_dlsym(void *handle, const char *fname)
       void *v;
       GenericFunc f;
    } u;
-#if defined(__blrts)
-   u.v = NULL;
-#elif defined(HAVE_DLOPEN)
+#if defined(HAVE_DLOPEN)
    u.v = dlsym(handle, fname);
 #elif defined(__MINGW32__)
    u.v = (void *) GetProcAddress(handle, fname);
@@ -89,9 +85,7 @@ _mesa_dlsym(void *handle, const char *fname)
 static inline void
 _mesa_dlclose(void *handle)
 {
-#if defined(__blrts)
-   (void) handle;
-#elif defined(HAVE_DLOPEN)
+#if defined(HAVE_DLOPEN)
    dlclose(handle);
 #elif defined(__MINGW32__)
    FreeLibrary(handle);




More information about the mesa-commit mailing list