1 files changed, 54 insertions, 19 deletions
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index 27395d87c..39b209fe1 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -44,7 +44,21 @@
 #ifndef _GLAPI_H
 #define _GLAPI_H
 
-#define GL_GLEXT_PROTOTYPES
+#ifdef _GLAPI_NO_EXPORTS
+#  define _GLAPI_EXPORT
+#else /* _GLAPI_NO_EXPORTS */
+#  ifdef _WIN32
+#    ifdef _GLAPI_DLL_EXPORTS
+#      define _GLAPI_EXPORT __declspec(dllexport)
+#    else
+#      define _GLAPI_EXPORT __declspec(dllimport)
+#    endif
+#  elif defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#    define _GLAPI_EXPORT __attribute__((visibility("default")))
+#  else
+#    define _GLAPI_EXPORT
+#  endif
+#endif /* _GLAPI_NO_EXPORTS */
 
 #include "GL/gl.h"
 #include "GL/glext.h"
@@ -80,22 +94,38 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
  **/
 #if defined (GLX_USE_TLS)
 
-const extern void *_glapi_Context;
-const extern struct _glapi_table *_glapi_Dispatch;
+_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch;
 
-extern TLS void * _glapi_tls_Context;
+_GLAPI_EXPORT extern const void *_glapi_Context;
+_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;
 
-# define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_tls_Context
+_GLAPI_EXPORT extern __thread void * _glapi_tls_Context;
 
+# define GET_DISPATCH() _glapi_tls_Dispatch
+# define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_tls_Context
+
+#else
+
+#ifdef INSERVER
+#define SERVEXTERN _declspec(dllimport)
 #else
+#define SERVEXTERN _declspec(dllexport)
+#endif
 
-extern void *_glapi_Context;
-extern struct _glapi_table *_glapi_Dispatch;
+SERVEXTERN void *_glapi_Context;
+SERVEXTERN struct _glapi_table *_glapi_Dispatch;
 
 # ifdef THREADS
-#  define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context())
+
+#  define GET_DISPATCH() \
+     (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())
+
+
+#  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) \
+     (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())
 # else
-#  define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_Context
+#  define GET_DISPATCH() _glapi_Dispatch
+#  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_Context
 # endif
 
 #endif /* defined (GLX_USE_TLS) */
@@ -105,38 +135,43 @@ extern struct _glapi_table *_glapi_Dispatch;
  ** GL API public functions
  **/
 
-extern void
+SERVEXTERN void
 _glapi_check_multithread(void);
 
-extern void
+
+SERVEXTERN void
 _glapi_set_context(void *context);
 
-extern void *
+
+SERVEXTERN void *
 _glapi_get_context(void);
 
-extern void
+
+SERVEXTERN void
 _glapi_set_dispatch(struct _glapi_table *dispatch);
 
-extern struct _glapi_table *
+
+SERVEXTERN struct _glapi_table *
 _glapi_get_dispatch(void);
 
-extern int
+SERVEXTERN int
 _glapi_begin_dispatch_override(struct _glapi_table *override);
 
-extern void
+SERVEXTERN void
 _glapi_end_dispatch_override(int layer);
 
 struct _glapi_table *
 _glapi_get_override_dispatch(int layer);
 
-extern GLuint
+SERVEXTERN GLuint
 _glapi_get_dispatch_table_size(void);
 
-extern int
+
+SERVEXTERN int
 _glapi_add_dispatch( const char * const * function_names,
 		     const char * parameter_signature );
 
-extern _glapi_proc
+_GLAPI_EXPORT _glapi_proc
 _glapi_get_proc_address(const char *funcName);
 
 extern struct _glapi_table *