Mesa git update 7 Mar 2011

3 files changed, 716 insertions, 729 deletions

diff --git a/mesalib/src/mapi/mapi/u_current.c b/mesalib/src/mapi/mapi/u_current.c
index 6e2958eb4..21a07abba 100644
--- a/mesalib/src/mapi/mapi/u_current.c
+++ b/mesalib/src/mapi/mapi/u_current.c
@@ -1,274 +1,266 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.1

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-/*

- * This file manages the OpenGL API dispatch layer.

- * The dispatch table (struct _glapi_table) is basically just a list

- * of function pointers.

- * There are functions to set/get the current dispatch table for the

- * current thread and to manage registration/dispatch of dynamically

- * added extension functions.

- *

- * It's intended that this file and the other glapi*.[ch] files are

- * flexible enough to be reused in several places:  XFree86, DRI-

- * based libGL.so, and perhaps the SGI SI.

- *

- * NOTE: There are no dependencies on Mesa in this code.

- *

- * Versions (API changes):

- *   2000/02/23  - original version for Mesa 3.3 and XFree86 4.0

- *   2001/01/16  - added dispatch override feature for Mesa 3.5

- *   2002/06/28  - added _glapi_set_warning_func(), Mesa 4.1.

- *   2002/10/01  - _glapi_get_proc_address() will now generate new entrypoints

- *                 itself (using offset ~0).  _glapi_add_entrypoint() can be

- *                 called afterward and it'll fill in the correct dispatch

- *                 offset.  This allows DRI libGL to avoid probing for DRI

- *                 drivers!  No changes to the public glapi interface.

- */

-

-#include "u_current.h"

-#include "u_thread.h"

-

-#ifndef MAPI_MODE_UTIL

-

-#include "table.h"

-#include "stub.h"

-

-#else

-

-extern void init_glapi_relocs_once(void);

-extern void (*__glapi_noop_table[])(void);

-

-#define table_noop_array __glapi_noop_table

-#define stub_init_once() init_glapi_relocs_once()

-

-#endif

-

-/**

- * \name Current dispatch and current context control variables

- *

- * Depending on whether or not multithreading is support, and the type of

- * support available, several variables are used to store the current context

- * pointer and the current dispatch table pointer.  In the non-threaded case,

- * the variables \c _glapi_Dispatch and \c _glapi_Context are used for this

- * purpose.

- *

- * In the "normal" threaded case, the variables \c _glapi_Dispatch and

- * \c _glapi_Context will be \c NULL if an application is detected as being

- * multithreaded.  Single-threaded applications will use \c _glapi_Dispatch

- * and \c _glapi_Context just like the case without any threading support.

- * When \c _glapi_Dispatch and \c _glapi_Context are \c NULL, the thread state

- * data \c _gl_DispatchTSD and \c ContextTSD are used.  Drivers and the

- * static dispatch functions access these variables via \c _glapi_get_dispatch

- * and \c _glapi_get_context.

- *

- * There is a race condition in setting \c _glapi_Dispatch to \c NULL.  It is

- * possible for the original thread to be setting it at the same instant a new

- * thread, perhaps running on a different processor, is clearing it.  Because

- * of that, \c ThreadSafe, which can only ever be changed to \c GL_TRUE, is

- * used to determine whether or not the application is multithreaded.

- * 

- * In the TLS case, the variables \c _glapi_Dispatch and \c _glapi_Context are

- * hardcoded to \c NULL.  Instead the TLS variables \c _glapi_tls_Dispatch and

- * \c _glapi_tls_Context are used.  Having \c _glapi_Dispatch and

- * \c _glapi_Context be hardcoded to \c NULL maintains binary compatability

- * between TLS enabled loaders and non-TLS DRI drivers.

- */

-/*@{*/

-#if defined(GLX_USE_TLS)

-

-__thread struct mapi_table *u_current_table

-    __attribute__((tls_model("initial-exec")))

-    = (struct mapi_table *) table_noop_array;

-

-__thread void *u_current_user

-    __attribute__((tls_model("initial-exec")));

-

-#else

-

-struct mapi_table *u_current_table =

-   (struct mapi_table *) table_noop_array;

-void *u_current_user;

-

-#ifdef THREADS

-struct u_tsd u_current_table_tsd;

-static struct u_tsd u_current_user_tsd;

-static int ThreadSafe;

-#endif /* THREADS */

-

-#endif /* defined(GLX_USE_TLS) */

-/*@}*/

-

-

-void

-u_current_destroy(void)

-{

-#if defined(THREADS) && defined(WIN32)

-   u_tsd_destroy(&u_current_table_tsd);

-   u_tsd_destroy(&u_current_user_tsd);

-#endif

-}

-

-

-#if defined(THREADS) && !defined(GLX_USE_TLS)

-

-static void

-u_current_init_tsd(void)

-{

-   u_tsd_init(&u_current_table_tsd);

-   u_tsd_init(&u_current_user_tsd);

-}

-

-/**

- * Mutex for multithread check.

- */

-#ifdef WIN32

-/* _glthread_DECLARE_STATIC_MUTEX is broken on windows.  There will be race! */

-#define CHECK_MULTITHREAD_LOCK()

-#define CHECK_MULTITHREAD_UNLOCK()

-#else

-u_mutex_declare_static(ThreadCheckMutex);

-#define CHECK_MULTITHREAD_LOCK() u_mutex_lock(ThreadCheckMutex)

-#define CHECK_MULTITHREAD_UNLOCK() u_mutex_unlock(ThreadCheckMutex)

-#endif

-

-/**

- * We should call this periodically from a function such as glXMakeCurrent

- * in order to test if multiple threads are being used.

- */

-void

-u_current_init(void)

-{

-   static unsigned long knownID;

-   static int firstCall = 1;

-

-   if (ThreadSafe)

-      return;

-

-   CHECK_MULTITHREAD_LOCK();

-   if (firstCall) {

-      u_current_init_tsd();

-

-      knownID = u_thread_self();

-      firstCall = 0;

-   }

-   else if (knownID != u_thread_self()) {

-      ThreadSafe = 1;

-      u_current_set(NULL);

-      u_current_set_user(NULL);

-   }

-   CHECK_MULTITHREAD_UNLOCK();

-}

-

-#else

-

-void

-u_current_init(void)

-{

-}

-

-#endif

-

-

-

-/**

- * Set the current context pointer for this thread.

- * The context pointer is an opaque type which should be cast to

- * void from the real context pointer type.

- */

-void

-u_current_set_user(const void *ptr)

-{

-   u_current_init();

-

-#if defined(GLX_USE_TLS)

-   u_current_user = (void *) ptr;

-#elif defined(THREADS)

-   u_tsd_set(&u_current_user_tsd, (void *) ptr);

-   u_current_user = (ThreadSafe) ? NULL : (void *) ptr;

-#else

-   u_current_user = (void *) ptr;

-#endif

-}

-

-/**

- * Get the current context pointer for this thread.

- * The context pointer is an opaque type which should be cast from

- * void to the real context pointer type.

- */

-void *

-u_current_get_user_internal(void)

-{

-#if defined(GLX_USE_TLS)

-   return u_current_user;

-#elif defined(THREADS)

-   return (ThreadSafe)

-      ? u_tsd_get(&u_current_user_tsd)

-      : u_current_user;

-#else

-   return u_current_user;

-#endif

-}

-

-/**

- * Set the global or per-thread dispatch table pointer.

- * If the dispatch parameter is NULL we'll plug in the no-op dispatch

- * table (__glapi_noop_table).

- */

-void

-u_current_set(const struct mapi_table *tbl)

-{

-   u_current_init();

-

-   stub_init_once();

-

-   if (!tbl)

-      tbl = (const struct mapi_table *) table_noop_array;

-

-#if defined(GLX_USE_TLS)

-   u_current_table = (struct mapi_table *) tbl;

-#elif defined(THREADS)

-   u_tsd_set(&u_current_table_tsd, (void *) tbl);

-   u_current_table = (ThreadSafe) ? NULL : (void *) tbl;

-#else

-   u_current_table = (struct mapi_table *) tbl;

-#endif

-}

-

-/**

- * Return pointer to current dispatch table for calling thread.

- */

-struct mapi_table *

-u_current_get_internal(void)

-{

-#if defined(GLX_USE_TLS)

-   return u_current_table;

-#elif defined(THREADS)

-   return (struct mapi_table *) ((ThreadSafe) ?

-         u_tsd_get(&u_current_table_tsd) : (void *) u_current_table);

-#else

-   return u_current_table;

-#endif

-}

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * This file manages the OpenGL API dispatch layer.
+ * The dispatch table (struct _glapi_table) is basically just a list
+ * of function pointers.
+ * There are functions to set/get the current dispatch table for the
+ * current thread and to manage registration/dispatch of dynamically
+ * added extension functions.
+ *
+ * It's intended that this file and the other glapi*.[ch] files are
+ * flexible enough to be reused in several places:  XFree86, DRI-
+ * based libGL.so, and perhaps the SGI SI.
+ *
+ * NOTE: There are no dependencies on Mesa in this code.
+ *
+ * Versions (API changes):
+ *   2000/02/23  - original version for Mesa 3.3 and XFree86 4.0
+ *   2001/01/16  - added dispatch override feature for Mesa 3.5
+ *   2002/06/28  - added _glapi_set_warning_func(), Mesa 4.1.
+ *   2002/10/01  - _glapi_get_proc_address() will now generate new entrypoints
+ *                 itself (using offset ~0).  _glapi_add_entrypoint() can be
+ *                 called afterward and it'll fill in the correct dispatch
+ *                 offset.  This allows DRI libGL to avoid probing for DRI
+ *                 drivers!  No changes to the public glapi interface.
+ */
+
+#include "u_current.h"
+#include "u_thread.h"
+
+#ifndef MAPI_MODE_UTIL
+
+#include "table.h"
+#include "stub.h"
+
+#else
+
+extern void init_glapi_relocs_once(void);
+extern void (*__glapi_noop_table[])(void);
+
+#define table_noop_array __glapi_noop_table
+#define stub_init_once() init_glapi_relocs_once()
+
+#endif
+
+/**
+ * \name Current dispatch and current context control variables
+ *
+ * Depending on whether or not multithreading is support, and the type of
+ * support available, several variables are used to store the current context
+ * pointer and the current dispatch table pointer.  In the non-threaded case,
+ * the variables \c _glapi_Dispatch and \c _glapi_Context are used for this
+ * purpose.
+ *
+ * In the "normal" threaded case, the variables \c _glapi_Dispatch and
+ * \c _glapi_Context will be \c NULL if an application is detected as being
+ * multithreaded.  Single-threaded applications will use \c _glapi_Dispatch
+ * and \c _glapi_Context just like the case without any threading support.
+ * When \c _glapi_Dispatch and \c _glapi_Context are \c NULL, the thread state
+ * data \c _gl_DispatchTSD and \c ContextTSD are used.  Drivers and the
+ * static dispatch functions access these variables via \c _glapi_get_dispatch
+ * and \c _glapi_get_context.
+ *
+ * There is a race condition in setting \c _glapi_Dispatch to \c NULL.  It is
+ * possible for the original thread to be setting it at the same instant a new
+ * thread, perhaps running on a different processor, is clearing it.  Because
+ * of that, \c ThreadSafe, which can only ever be changed to \c GL_TRUE, is
+ * used to determine whether or not the application is multithreaded.
+ * 
+ * In the TLS case, the variables \c _glapi_Dispatch and \c _glapi_Context are
+ * hardcoded to \c NULL.  Instead the TLS variables \c _glapi_tls_Dispatch and
+ * \c _glapi_tls_Context are used.  Having \c _glapi_Dispatch and
+ * \c _glapi_Context be hardcoded to \c NULL maintains binary compatability
+ * between TLS enabled loaders and non-TLS DRI drivers.
+ */
+/*@{*/
+#if defined(GLX_USE_TLS)
+
+__thread struct mapi_table *u_current_table
+    __attribute__((tls_model("initial-exec")))
+    = (struct mapi_table *) table_noop_array;
+
+__thread void *u_current_user
+    __attribute__((tls_model("initial-exec")));
+
+#else
+
+struct mapi_table *u_current_table =
+   (struct mapi_table *) table_noop_array;
+void *u_current_user;
+
+#ifdef THREADS
+struct u_tsd u_current_table_tsd;
+static struct u_tsd u_current_user_tsd;
+static int ThreadSafe;
+#endif /* THREADS */
+
+#endif /* defined(GLX_USE_TLS) */
+/*@}*/
+
+
+void
+u_current_destroy(void)
+{
+#if defined(THREADS) && defined(WIN32)
+   u_tsd_destroy(&u_current_table_tsd);
+   u_tsd_destroy(&u_current_user_tsd);
+#endif
+}
+
+
+#if defined(THREADS) && !defined(GLX_USE_TLS)
+
+static void
+u_current_init_tsd(void)
+{
+   u_tsd_init(&u_current_table_tsd);
+   u_tsd_init(&u_current_user_tsd);
+}
+
+/**
+ * Mutex for multithread check.
+ */
+u_mutex_declare_static(ThreadCheckMutex);
+
+/**
+ * We should call this periodically from a function such as glXMakeCurrent
+ * in order to test if multiple threads are being used.
+ */
+void
+u_current_init(void)
+{
+   static unsigned long knownID;
+   static int firstCall = 1;
+
+   if (ThreadSafe)
+      return;
+
+   u_mutex_lock(ThreadCheckMutex);
+   if (firstCall) {
+      u_current_init_tsd();
+
+      knownID = u_thread_self();
+      firstCall = 0;
+   }
+   else if (knownID != u_thread_self()) {
+      ThreadSafe = 1;
+      u_current_set(NULL);
+      u_current_set_user(NULL);
+   }
+   u_mutex_unlock(ThreadCheckMutex);
+}
+
+#else
+
+void
+u_current_init(void)
+{
+}
+
+#endif
+
+
+
+/**
+ * Set the current context pointer for this thread.
+ * The context pointer is an opaque type which should be cast to
+ * void from the real context pointer type.
+ */
+void
+u_current_set_user(const void *ptr)
+{
+   u_current_init();
+
+#if defined(GLX_USE_TLS)
+   u_current_user = (void *) ptr;
+#elif defined(THREADS)
+   u_tsd_set(&u_current_user_tsd, (void *) ptr);
+   u_current_user = (ThreadSafe) ? NULL : (void *) ptr;
+#else
+   u_current_user = (void *) ptr;
+#endif
+}
+
+/**
+ * Get the current context pointer for this thread.
+ * The context pointer is an opaque type which should be cast from
+ * void to the real context pointer type.
+ */
+void *
+u_current_get_user_internal(void)
+{
+#if defined(GLX_USE_TLS)
+   return u_current_user;
+#elif defined(THREADS)
+   return (ThreadSafe)
+      ? u_tsd_get(&u_current_user_tsd)
+      : u_current_user;
+#else
+   return u_current_user;
+#endif
+}
+
+/**
+ * Set the global or per-thread dispatch table pointer.
+ * If the dispatch parameter is NULL we'll plug in the no-op dispatch
+ * table (__glapi_noop_table).
+ */
+void
+u_current_set(const struct mapi_table *tbl)
+{
+   u_current_init();
+
+   stub_init_once();
+
+   if (!tbl)
+      tbl = (const struct mapi_table *) table_noop_array;
+
+#if defined(GLX_USE_TLS)
+   u_current_table = (struct mapi_table *) tbl;
+#elif defined(THREADS)
+   u_tsd_set(&u_current_table_tsd, (void *) tbl);
+   u_current_table = (ThreadSafe) ? NULL : (void *) tbl;
+#else
+   u_current_table = (struct mapi_table *) tbl;
+#endif
+}
+
+/**
+ * Return pointer to current dispatch table for calling thread.
+ */
+struct mapi_table *
+u_current_get_internal(void)
+{
+#if defined(GLX_USE_TLS)
+   return u_current_table;
+#elif defined(THREADS)
+   return (struct mapi_table *) ((ThreadSafe) ?
+         u_tsd_get(&u_current_table_tsd) : (void *) u_current_table);
+#else
+   return u_current_table;
+#endif
+}
diff --git a/mesalib/src/mapi/mapi/u_thread.c b/mesalib/src/mapi/mapi/u_thread.c
index c15093a7c..12e748fe8 100644
--- a/mesalib/src/mapi/mapi/u_thread.c
+++ b/mesalib/src/mapi/mapi/u_thread.c
@@ -1,254 +1,249 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5.1

- *

- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-#include <stdio.h>

-#include <stdlib.h>

-#include "u_compiler.h"

-#include "u_thread.h"

-

-

-/*

- * This file should still compile even when THREADS is not defined.

- * This is to make things easier to deal with on the makefile scene..

- */

-#ifdef THREADS

-#include <errno.h>

-

-/*

- * Error messages

- */

-#define INIT_TSD_ERROR "_glthread_: failed to allocate key for thread specific data"

-#define GET_TSD_ERROR "_glthread_: failed to get thread specific data"

-#define SET_TSD_ERROR "_glthread_: thread failed to set thread specific data"

-

-

-/*

- * Magic number to determine if a TSD object has been initialized.

- * Kind of a hack but there doesn't appear to be a better cross-platform

- * solution.

- */

-#define INIT_MAGIC 0xff8adc98

-

-

-

-/*

- * POSIX Threads -- The best way to go if your platform supports them.

- *                  Solaris >= 2.5 have POSIX threads, IRIX >= 6.4 reportedly

- *                  has them, and many of the free Unixes now have them.

- *                  Be sure to use appropriate -mt or -D_REENTRANT type

- *                  compile flags when building.

- */

-#ifdef PTHREADS

-

-unsigned long

-u_thread_self(void)

-{

-   return (unsigned long) pthread_self();

-}

-

-

-void

-u_tsd_init(struct u_tsd *tsd)

-{

-   if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {

-      perror(INIT_TSD_ERROR);

-      exit(-1);

-   }

-   tsd->initMagic = INIT_MAGIC;

-}

-

-

-void *

-u_tsd_get(struct u_tsd *tsd)

-{

-   if (tsd->initMagic != (int) INIT_MAGIC) {

-      u_tsd_init(tsd);

-   }

-   return pthread_getspecific(tsd->key);

-}

-

-

-void

-u_tsd_set(struct u_tsd *tsd, void *ptr)

-{

-   if (tsd->initMagic != (int) INIT_MAGIC) {

-      u_tsd_init(tsd);

-   }

-   if (pthread_setspecific(tsd->key, ptr) != 0) {

-      perror(SET_TSD_ERROR);

-      exit(-1);

-   }

-}

-

-#endif /* PTHREADS */

-

-

-

-/*

- * Win32 Threads.  The only available option for Windows 95/NT.

- * Be sure that you compile using the Multithreaded runtime, otherwise

- * bad things will happen.

- */

-#ifdef WIN32

-

-static void InsteadOf_exit(int nCode)

-{

-   DWORD dwErr = GetLastError();

-}

-

-unsigned long

-u_thread_self(void)

-{

-   return GetCurrentThreadId();

-}

-

-

-void

-u_tsd_init(struct u_tsd *tsd)

-{

-   tsd->key = TlsAlloc();

-   if (tsd->key == TLS_OUT_OF_INDEXES) {

-      perror(INIT_TSD_ERROR);

-      InsteadOf_exit(-1);

-   }

-   tsd->initMagic = INIT_MAGIC;

-}

-

-

-void

-u_tsd_destroy(struct u_tsd *tsd)

-{

-   if (tsd->initMagic != INIT_MAGIC) {

-      return;

-   }

-   TlsFree(tsd->key);

-   tsd->initMagic = 0x0;

-}

-

-

-void *

-u_tsd_get(struct u_tsd *tsd)

-{

-   if (tsd->initMagic != INIT_MAGIC) {

-      u_tsd_init(tsd);

-   }

-   return TlsGetValue(tsd->key);

-}

-

-

-void

-u_tsd_set(struct u_tsd *tsd, void *ptr)

-{

-   /* the following code assumes that the struct u_tsd has been initialized

-      to zero at creation */

-   if (tsd->initMagic != INIT_MAGIC) {

-      u_tsd_init(tsd);

-   }

-   if (TlsSetValue(tsd->key, ptr) == 0) {

-      perror(SET_TSD_ERROR);

-      InsteadOf_exit(-1);

-   }

-}

-

-#endif /* WIN32 */

-

-/*

- * BeOS threads

- */

-#ifdef BEOS_THREADS

-

-unsigned long

-u_thread_self(void)

-{

-   return (unsigned long) find_thread(NULL);

-}

-

-void

-u_tsd_init(struct u_tsd *tsd)

-{

-   tsd->key = tls_allocate();

-   tsd->initMagic = INIT_MAGIC;

-}

-

-void *

-u_tsd_get(struct u_tsd *tsd)

-{

-   if (tsd->initMagic != (int) INIT_MAGIC) {

-      u_tsd_init(tsd);

-   }

-   return tls_get(tsd->key);

-}

-

-void

-u_tsd_set(struct u_tsd *tsd, void *ptr)

-{

-   if (tsd->initMagic != (int) INIT_MAGIC) {

-      u_tsd_init(tsd);

-   }

-   tls_set(tsd->key, ptr);

-}

-

-#endif /* BEOS_THREADS */

-

-

-

-#else  /* THREADS */

-

-

-/*

- * no-op functions

- */

-

-unsigned long

-u_thread_self(void)

-{

-   return 0;

-}

-

-

-void

-u_tsd_init(struct u_tsd *tsd)

-{

-   (void) tsd;

-}

-

-

-void *

-u_tsd_get(struct u_tsd *tsd)

-{

-   (void) tsd;

-   return NULL;

-}

-

-

-void

-u_tsd_set(struct u_tsd *tsd, void *ptr)

-{

-   (void) tsd;

-   (void) ptr;

-}

-

-

-#endif /* THREADS */

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5.1
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "u_compiler.h"
+#include "u_thread.h"
+
+
+/*
+ * This file should still compile even when THREADS is not defined.
+ * This is to make things easier to deal with on the makefile scene..
+ */
+#ifdef THREADS
+#include <errno.h>
+
+/*
+ * Error messages
+ */
+#define INIT_TSD_ERROR "_glthread_: failed to allocate key for thread specific data"
+#define GET_TSD_ERROR "_glthread_: failed to get thread specific data"
+#define SET_TSD_ERROR "_glthread_: thread failed to set thread specific data"
+
+
+/*
+ * Magic number to determine if a TSD object has been initialized.
+ * Kind of a hack but there doesn't appear to be a better cross-platform
+ * solution.
+ */
+#define INIT_MAGIC 0xff8adc98
+
+
+
+/*
+ * POSIX Threads -- The best way to go if your platform supports them.
+ *                  Solaris >= 2.5 have POSIX threads, IRIX >= 6.4 reportedly
+ *                  has them, and many of the free Unixes now have them.
+ *                  Be sure to use appropriate -mt or -D_REENTRANT type
+ *                  compile flags when building.
+ */
+#ifdef PTHREADS
+
+unsigned long
+u_thread_self(void)
+{
+   return (unsigned long) pthread_self();
+}
+
+
+void
+u_tsd_init(struct u_tsd *tsd)
+{
+   if (pthread_key_create(&tsd->key, NULL/*free*/) != 0) {
+      perror(INIT_TSD_ERROR);
+      exit(-1);
+   }
+   tsd->initMagic = INIT_MAGIC;
+}
+
+
+void *
+u_tsd_get(struct u_tsd *tsd)
+{
+   if (tsd->initMagic != (int) INIT_MAGIC) {
+      u_tsd_init(tsd);
+   }
+   return pthread_getspecific(tsd->key);
+}
+
+
+void
+u_tsd_set(struct u_tsd *tsd, void *ptr)
+{
+   if (tsd->initMagic != (int) INIT_MAGIC) {
+      u_tsd_init(tsd);
+   }
+   if (pthread_setspecific(tsd->key, ptr) != 0) {
+      perror(SET_TSD_ERROR);
+      exit(-1);
+   }
+}
+
+#endif /* PTHREADS */
+
+
+
+/*
+ * Win32 Threads.  The only available option for Windows 95/NT.
+ * Be sure that you compile using the Multithreaded runtime, otherwise
+ * bad things will happen.
+ */
+#ifdef WIN32
+
+unsigned long
+u_thread_self(void)
+{
+   return GetCurrentThreadId();
+}
+
+
+void
+u_tsd_init(struct u_tsd *tsd)
+{
+   tsd->key = TlsAlloc();
+   if (tsd->key == TLS_OUT_OF_INDEXES) {
+      perror(INIT_TSD_ERROR);
+      exit(-1);
+   }
+   tsd->initMagic = INIT_MAGIC;
+}
+
+
+void
+u_tsd_destroy(struct u_tsd *tsd)
+{
+   if (tsd->initMagic != INIT_MAGIC) {
+      return;
+   }
+   TlsFree(tsd->key);
+   tsd->initMagic = 0x0;
+}
+
+
+void *
+u_tsd_get(struct u_tsd *tsd)
+{
+   if (tsd->initMagic != INIT_MAGIC) {
+      u_tsd_init(tsd);
+   }
+   return TlsGetValue(tsd->key);
+}
+
+
+void
+u_tsd_set(struct u_tsd *tsd, void *ptr)
+{
+   /* the following code assumes that the struct u_tsd has been initialized
+      to zero at creation */
+   if (tsd->initMagic != INIT_MAGIC) {
+      u_tsd_init(tsd);
+   }
+   if (TlsSetValue(tsd->key, ptr) == 0) {
+      perror(SET_TSD_ERROR);
+      exit(-1);
+   }
+}
+
+#endif /* WIN32 */
+
+/*
+ * BeOS threads
+ */
+#ifdef BEOS_THREADS
+
+unsigned long
+u_thread_self(void)
+{
+   return (unsigned long) find_thread(NULL);
+}
+
+void
+u_tsd_init(struct u_tsd *tsd)
+{
+   tsd->key = tls_allocate();
+   tsd->initMagic = INIT_MAGIC;
+}
+
+void *
+u_tsd_get(struct u_tsd *tsd)
+{
+   if (tsd->initMagic != (int) INIT_MAGIC) {
+      u_tsd_init(tsd);
+   }
+   return tls_get(tsd->key);
+}
+
+void
+u_tsd_set(struct u_tsd *tsd, void *ptr)
+{
+   if (tsd->initMagic != (int) INIT_MAGIC) {
+      u_tsd_init(tsd);
+   }
+   tls_set(tsd->key, ptr);
+}
+
+#endif /* BEOS_THREADS */
+
+
+
+#else  /* THREADS */
+
+
+/*
+ * no-op functions
+ */
+
+unsigned long
+u_thread_self(void)
+{
+   return 0;
+}
+
+
+void
+u_tsd_init(struct u_tsd *tsd)
+{
+   (void) tsd;
+}
+
+
+void *
+u_tsd_get(struct u_tsd *tsd)
+{
+   (void) tsd;
+   return NULL;
+}
+
+
+void
+u_tsd_set(struct u_tsd *tsd, void *ptr)
+{
+   (void) tsd;
+   (void) ptr;
+}
+
+
+#endif /* THREADS */
diff --git a/mesalib/src/mapi/mapi/u_thread.h b/mesalib/src/mapi/mapi/u_thread.h
index 7f98c871f..1cc8be3fa 100644
--- a/mesalib/src/mapi/mapi/u_thread.h
+++ b/mesalib/src/mapi/mapi/u_thread.h
@@ -1,201 +1,201 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5.2

- *

- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included

- * in all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- */

-

-

-/*

- * Thread support for gl dispatch.

- *

- * Initial version by John Stone (j.stone@acm.org) (johns@cs.umr.edu)

- *                and Christoph Poliwoda (poliwoda@volumegraphics.com)

- * Revised by Keith Whitwell

- * Adapted for new gl dispatcher by Brian Paul

- * Modified for use in mapi by Chia-I Wu

- */

-

-/*

- * If this file is accidentally included by a non-threaded build,

- * it should not cause the build to fail, or otherwise cause problems.

- * In general, it should only be included when needed however.

- */

-

-#ifndef _U_THREAD_H_

-#define _U_THREAD_H_

-

-#include "u_compiler.h"

-

-#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)

-#ifndef THREADS

-#define THREADS

-#endif

-#endif

-

-/*

- * POSIX threads. This should be your choice in the Unix world

- * whenever possible.  When building with POSIX threads, be sure

- * to enable any compiler flags which will cause the MT-safe

- * libc (if one exists) to be used when linking, as well as any

- * header macros for MT-safe errno, etc.  For Solaris, this is the -mt

- * compiler flag.  On Solaris with gcc, use -D_REENTRANT to enable

- * proper compiling for MT-safe libc etc.

- */

-#if defined(PTHREADS)

-#include <pthread.h> /* POSIX threads headers */

-

-struct u_tsd {

-   pthread_key_t key;

-   int initMagic;

-};

-

-typedef pthread_mutex_t u_mutex;

-

-#define u_mutex_declare_static(name) \

-   static u_mutex name = PTHREAD_MUTEX_INITIALIZER

-

-#define u_mutex_init(name)    pthread_mutex_init(&(name), NULL)

-#define u_mutex_destroy(name) pthread_mutex_destroy(&(name))

-#define u_mutex_lock(name)    (void) pthread_mutex_lock(&(name))

-#define u_mutex_unlock(name)  (void) pthread_mutex_unlock(&(name))

-

-#endif /* PTHREADS */

-

-

-/*

- * Windows threads. Should work with Windows NT and 95.

- * IMPORTANT: Link with multithreaded runtime library when THREADS are

- * used!

- */

-#ifdef WIN32

-#include <windows.h>

-

-struct u_tsd {

-   DWORD key;

-   int   initMagic;

-};

-

-typedef CRITICAL_SECTION u_mutex;

-

-/* http://locklessinc.com/articles/pthreads_on_windows/ */

-#define u_mutex_declare_static(name) \

-   /* static */ u_mutex name = {(void*)-1, -1, 0, 0, 0, 0}

-

-#define u_mutex_init(name)    InitializeCriticalSection(&name)

-#define u_mutex_destroy(name) DeleteCriticalSection(&name)

-#define u_mutex_lock(name)    EnterCriticalSection(&name)

-#define u_mutex_unlock(name)  LeaveCriticalSection(&name)

-

-#endif /* WIN32 */

-

-

-/*

- * BeOS threads. R5.x required.

- */

-#ifdef BEOS_THREADS

-

-/* Problem with OS.h and this file on haiku */

-#ifndef __HAIKU__

-#include <kernel/OS.h>

-#endif

-

-#include <support/TLS.h>

-

-/* The only two typedefs required here

- * this is cause of the OS.h problem

- */

-#ifdef __HAIKU__

-typedef int32 thread_id;

-typedef int32 sem_id;

-#endif

-

-struct u_tsd {

-   int32        key;

-   int          initMagic;

-};

-

-/* Use Benaphore, aka speeder semaphore */

-typedef struct {

-    int32   lock;

-    sem_id  sem;

-} benaphore;

-typedef benaphore u_mutex;

-

-#define u_mutex_declare_static(name) \

-   static u_mutex name = { 0, 0 }

-

-#define u_mutex_init(name) \

-   name.sem = create_sem(0, #name"_benaphore"), \

-   name.lock = 0

-

-#define u_mutex_destroy(name) \

-   delete_sem(name.sem), \

-   name.lock = 0

-

-#define u_mutex_lock(name) \

-   if (name.sem == 0) \

-      u_mutex_init(name); \

-   if (atomic_add(&(name.lock), 1) >= 1) \

-      acquire_sem(name.sem)

-

-#define u_mutex_unlock(name) \

-   if (atomic_add(&(name.lock), -1) > 1) \

-      release_sem(name.sem)

-

-#endif /* BEOS_THREADS */

-

-

-/*

- * THREADS not defined

- */

-#ifndef THREADS

-

-struct u_tsd {

-   int initMagic; 

-};

-

-typedef unsigned u_mutex;

-

-#define u_mutex_declare_static(name)   static u_mutex name = 0

-#define u_mutex_init(name)             (void) name

-#define u_mutex_destroy(name)          (void) name

-#define u_mutex_lock(name)             (void) name

-#define u_mutex_unlock(name)           (void) name

-

-#endif /* THREADS */

-

-

-unsigned long

-u_thread_self(void);

-

-void

-u_tsd_init(struct u_tsd *tsd);

-

-void

-u_tsd_destroy(struct u_tsd *tsd); /* WIN32 only */

-

-void *

-u_tsd_get(struct u_tsd *tsd);

-

-void

-u_tsd_set(struct u_tsd *tsd, void *ptr);

-

-#endif /* _U_THREAD_H_ */

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5.2
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/*
+ * Thread support for gl dispatch.
+ *
+ * Initial version by John Stone (j.stone@acm.org) (johns@cs.umr.edu)
+ *                and Christoph Poliwoda (poliwoda@volumegraphics.com)
+ * Revised by Keith Whitwell
+ * Adapted for new gl dispatcher by Brian Paul
+ * Modified for use in mapi by Chia-I Wu
+ */
+
+/*
+ * If this file is accidentally included by a non-threaded build,
+ * it should not cause the build to fail, or otherwise cause problems.
+ * In general, it should only be included when needed however.
+ */
+
+#ifndef _U_THREAD_H_
+#define _U_THREAD_H_
+
+#include "u_compiler.h"
+
+#if defined(PTHREADS) || defined(WIN32) || defined(BEOS_THREADS)
+#ifndef THREADS
+#define THREADS
+#endif
+#endif
+
+/*
+ * POSIX threads. This should be your choice in the Unix world
+ * whenever possible.  When building with POSIX threads, be sure
+ * to enable any compiler flags which will cause the MT-safe
+ * libc (if one exists) to be used when linking, as well as any
+ * header macros for MT-safe errno, etc.  For Solaris, this is the -mt
+ * compiler flag.  On Solaris with gcc, use -D_REENTRANT to enable
+ * proper compiling for MT-safe libc etc.
+ */
+#if defined(PTHREADS)
+#include <pthread.h> /* POSIX threads headers */
+
+struct u_tsd {
+   pthread_key_t key;
+   int initMagic;
+};
+
+typedef pthread_mutex_t u_mutex;
+
+#define u_mutex_declare_static(name) \
+   static u_mutex name = PTHREAD_MUTEX_INITIALIZER
+
+#define u_mutex_init(name)    pthread_mutex_init(&(name), NULL)
+#define u_mutex_destroy(name) pthread_mutex_destroy(&(name))
+#define u_mutex_lock(name)    (void) pthread_mutex_lock(&(name))
+#define u_mutex_unlock(name)  (void) pthread_mutex_unlock(&(name))
+
+#endif /* PTHREADS */
+
+
+/*
+ * Windows threads. Should work with Windows NT and 95.
+ * IMPORTANT: Link with multithreaded runtime library when THREADS are
+ * used!
+ */
+#ifdef WIN32
+#include <windows.h>
+
+struct u_tsd {
+   DWORD key;
+   int   initMagic;
+};
+
+typedef CRITICAL_SECTION u_mutex;
+
+/* http://locklessinc.com/articles/pthreads_on_windows/ */
+#define u_mutex_declare_static(name) \
+   static u_mutex name = {(PCRITICAL_SECTION_DEBUG)-1, -1, 0, 0, 0, 0}
+
+#define u_mutex_init(name)    InitializeCriticalSection(&name)
+#define u_mutex_destroy(name) DeleteCriticalSection(&name)
+#define u_mutex_lock(name)    EnterCriticalSection(&name)
+#define u_mutex_unlock(name)  LeaveCriticalSection(&name)
+
+#endif /* WIN32 */
+
+
+/*
+ * BeOS threads. R5.x required.
+ */
+#ifdef BEOS_THREADS
+
+/* Problem with OS.h and this file on haiku */
+#ifndef __HAIKU__
+#include <kernel/OS.h>
+#endif
+
+#include <support/TLS.h>
+
+/* The only two typedefs required here
+ * this is cause of the OS.h problem
+ */
+#ifdef __HAIKU__
+typedef int32 thread_id;
+typedef int32 sem_id;
+#endif
+
+struct u_tsd {
+   int32        key;
+   int          initMagic;
+};
+
+/* Use Benaphore, aka speeder semaphore */
+typedef struct {
+    int32   lock;
+    sem_id  sem;
+} benaphore;
+typedef benaphore u_mutex;
+
+#define u_mutex_declare_static(name) \
+   static u_mutex name = { 0, 0 }
+
+#define u_mutex_init(name) \
+   name.sem = create_sem(0, #name"_benaphore"), \
+   name.lock = 0
+
+#define u_mutex_destroy(name) \
+   delete_sem(name.sem), \
+   name.lock = 0
+
+#define u_mutex_lock(name) \
+   if (name.sem == 0) \
+      u_mutex_init(name); \
+   if (atomic_add(&(name.lock), 1) >= 1) \
+      acquire_sem(name.sem)
+
+#define u_mutex_unlock(name) \
+   if (atomic_add(&(name.lock), -1) > 1) \
+      release_sem(name.sem)
+
+#endif /* BEOS_THREADS */
+
+
+/*
+ * THREADS not defined
+ */
+#ifndef THREADS
+
+struct u_tsd {
+   int initMagic; 
+};
+
+typedef unsigned u_mutex;
+
+#define u_mutex_declare_static(name)   static u_mutex name = 0
+#define u_mutex_init(name)             (void) name
+#define u_mutex_destroy(name)          (void) name
+#define u_mutex_lock(name)             (void) name
+#define u_mutex_unlock(name)           (void) name
+
+#endif /* THREADS */
+
+
+unsigned long
+u_thread_self(void);
+
+void
+u_tsd_init(struct u_tsd *tsd);
+
+void
+u_tsd_destroy(struct u_tsd *tsd); /* WIN32 only */
+
+void *
+u_tsd_get(struct u_tsd *tsd);
+
+void
+u_tsd_set(struct u_tsd *tsd, void *ptr);
+
+#endif /* _U_THREAD_H_ */