Commit a385d185 authored by Emil Velikov's avatar Emil Velikov

glx: remove support for non-multithreaded platforms

Implicitly required for a while, although commit 9385c592 (mapi:
remove u_thread.h) was the one that put the final nail on the
coffin.
Signed-off-by: Emil Velikov's avatarEmil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Brian Paul's avatarBrian Paul <brianp@vmware.com>
parent 42144170
......@@ -204,9 +204,8 @@ terribly relevant.</p>
few preprocessor defines.</p>
<ul>
<li>If <tt>GLX_USE_TLS</tt> is defined, method #4 is used.</li>
<li>If <tt>HAVE_PTHREAD</tt> is defined, method #3 is used.</li>
<li>If <tt>WIN32_THREADS</tt> is defined, method #2 is used.</li>
<li>If <tt>GLX_USE_TLS</tt> is defined, method #3 is used.</li>
<li>If <tt>HAVE_PTHREAD</tt> is defined, method #2 is used.</li>
<li>If none of the preceding are defined, method #1 is used.</li>
</ul>
......
......@@ -48,12 +48,10 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <pthread.h>
#include "GL/glxproto.h"
#include "glxconfig.h"
#include "glxhash.h"
#if defined( HAVE_PTHREAD )
# include <pthread.h>
#endif
#include "util/macros.h"
#include "glxextensions.h"
......@@ -629,7 +627,6 @@ extern void __glXPreferEGL(int state);
extern int __glXDebug;
/* This is per-thread storage in an MT environment */
#if defined( HAVE_PTHREAD )
extern void __glXSetCurrentContext(struct glx_context * c);
......@@ -646,14 +643,6 @@ extern struct glx_context *__glXGetCurrentContext(void);
# endif /* defined( GLX_USE_TLS ) */
#else
extern struct glx_context *__glXcurrentContext;
#define __glXGetCurrentContext() __glXcurrentContext
#define __glXSetCurrentContext(gc) __glXcurrentContext = gc
#endif /* defined( HAVE_PTHREAD ) */
extern void __glXSetCurrentContextNull(void);
......@@ -661,14 +650,9 @@ extern void __glXSetCurrentContextNull(void);
** Global lock for all threads in this address space using the GLX
** extension
*/
#if defined( HAVE_PTHREAD )
extern pthread_mutex_t __glXmutex;
#define __glXLock() pthread_mutex_lock(&__glXmutex)
#define __glXUnlock() pthread_mutex_unlock(&__glXmutex)
#else
#define __glXLock()
#define __glXUnlock()
#endif
/*
** Setup for a command. Initialize the extension for dpy if necessary.
......
......@@ -33,9 +33,7 @@
* Client-side GLX interface for current context management.
*/
#ifdef HAVE_PTHREAD
#include <pthread.h>
#endif
#include "glxclient.h"
......@@ -67,8 +65,6 @@ struct glx_context dummyContext = {
* Current context management and locking
*/
#if defined( HAVE_PTHREAD )
_X_HIDDEN pthread_mutex_t __glXmutex = PTHREAD_MUTEX_INITIALIZER;
# if defined( GLX_USE_TLS )
......@@ -138,13 +134,6 @@ __glXGetCurrentContext(void)
# endif /* defined( GLX_USE_TLS ) */
#else
/* not thread safe */
_X_HIDDEN struct glx_context *__glXcurrentContext = &dummyContext;
#endif
_X_HIDDEN void
__glXSetCurrentContextNull(void)
......
......@@ -77,7 +77,7 @@ indirect_create_context_attribs(struct glx_screen *base,
__thread void *__glX_tls_Context = NULL;
#if defined(HAVE_PTHREAD) && !defined(GLX_USE_TLS)
#if !defined(GLX_USE_TLS)
extern "C" struct glx_context *
__glXGetCurrentContext()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment