aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/glapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-11-23 15:23:16 +0000
committermarha <marha@users.sourceforge.net>2009-11-23 15:23:16 +0000
commit699ed6596b3b351dbbd88c1c2ef00eb07af9c1ee (patch)
treefc332f4b5adc964e2f5a7a3b69db8c96204f046a /mesalib/src/mesa/glapi
parent29556eae54fc97f382b8d690dfc3a47a742800dc (diff)
downloadvcxsrv-699ed6596b3b351dbbd88c1c2ef00eb07af9c1ee.tar.gz
vcxsrv-699ed6596b3b351dbbd88c1c2ef00eb07af9c1ee.tar.bz2
vcxsrv-699ed6596b3b351dbbd88c1c2ef00eb07af9c1ee.zip
- Solved problems when running opengl with indirect rendering (export LIBGL_ALWAYS_INDIRECT=1)
- removed mesaopengl32.dll (not needed anymore)
Diffstat (limited to 'mesalib/src/mesa/glapi')
-rw-r--r--mesalib/src/mesa/glapi/glapi.c6
-rw-r--r--mesalib/src/mesa/glapi/glapi.h10
2 files changed, 12 insertions, 4 deletions
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())