From 699ed6596b3b351dbbd88c1c2ef00eb07af9c1ee Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 23 Nov 2009 15:23:16 +0000
Subject: - Solved problems when running opengl with indirect rendering (export
 LIBGL_ALWAYS_INDIRECT=1) - removed mesaopengl32.dll (not needed anymore)

---
 mesalib/src/mesa/glapi/glapi.c |  6 ++++--
 mesalib/src/mesa/glapi/glapi.h | 10 ++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'mesalib/src')

diff --git a/mesalib/src/mesa/glapi/glapi.c b/mesalib/src/mesa/glapi/glapi.c
index e36fccb35..216dede90 100644
--- a/mesalib/src/mesa/glapi/glapi.c
+++ b/mesalib/src/mesa/glapi/glapi.c
@@ -223,16 +223,18 @@ void FreeAllTSD(void)
 
 #endif /* defined(THREADS) */
 
+#ifndef INSERVER
 PUBLIC struct _glapi_table *_glapi_Dispatch = 
   (struct _glapi_table *) __glapi_noop_table;
 PUBLIC void *_glapi_Context = NULL;
+#endif
 
 #endif /* defined(GLX_USE_TLS) */
 /*@}*/
 
 
 
-
+#ifndef INSERVER
 /**
  * We should call this periodically from a function such as glXMakeCurrent
  * in order to test if multiple threads are being used.
@@ -264,7 +266,7 @@ _glapi_check_multithread(void)
    CHECK_MULTITHREAD_UNLOCK();
 #endif
 }
-
+#endif
 
 
 /**
diff --git a/mesalib/src/mesa/glapi/glapi.h b/mesalib/src/mesa/glapi/glapi.h
index 5fb540122..8a5006fd9 100644
--- a/mesalib/src/mesa/glapi/glapi.h
+++ b/mesalib/src/mesa/glapi/glapi.h
@@ -90,8 +90,14 @@ extern __thread void * _glapi_tls_Context
 
 #else
 
-extern void *_glapi_Context;
-extern struct _glapi_table *_glapi_Dispatch;
+#ifdef INSERVER
+#define EXTERN _declspec(dllimport)
+#else
+#define EXTERN extern
+#endif
+
+EXTERN void *_glapi_Context;
+EXTERN struct _glapi_table *_glapi_Dispatch;
 
 # ifdef THREADS
 #  define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context())
-- 
cgit v1.2.3