fix GL_DOT3_RGBA texture combiner mode in generated fragment programs (bug #11030)

[mesa.git] / src / mesa / glapi / glthread.c

diff --git a/src/mesa/glapi/glthread.c b/src/mesa/glapi/glthread.c
index 66f801535e8d41b47e7cea7cec56b21860133ab7..4513853f5a2b1f4e68726f1cc33e5bf0ab9f8f8f 100644 (file)
--- a/src/mesa/glapi/glthread.c
+++ b/src/mesa/glapi/glthread.c
@@ -1,21 +1,19 @@
-/* $Id: glthread.c,v 1.5 2000/02/10 21:54:06 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- * 
+ * 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
@@ -31,12 +29,8 @@
  */
 
 
-#ifdef PC_ALL
-#include "all.h"
-#else
 #include "glheader.h"
-#include "glthread.h" 
-#endif
+#include "glthread.h"
 
 
 /*
@@ -93,7 +87,7 @@ _glthread_InitTSD(_glthread_TSD *tsd)
 void *
 _glthread_GetTSD(_glthread_TSD *tsd)
 {
-   if (tsd->initMagic != INIT_MAGIC) {
+   if (tsd->initMagic != (int) INIT_MAGIC) {
       _glthread_InitTSD(tsd);
    }
    return pthread_getspecific(tsd->key);
@@ -103,7 +97,7 @@ _glthread_GetTSD(_glthread_TSD *tsd)
 void
 _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
 {
-   if (tsd->initMagic != INIT_MAGIC) {
+   if (tsd->initMagic != (int) INIT_MAGIC) {
       _glthread_InitTSD(tsd);
    }
    if (pthread_setspecific(tsd->key, ptr) != 0) {
@@ -117,9 +111,9 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
 
 
 /*
- * Solaris/Unix International Threads -- Use only if POSIX threads 
+ * Solaris/Unix International Threads -- Use only if POSIX threads
  *   aren't available on your Unix platform.  Solaris 2.[34] are examples
- *   of platforms where this is the case.  Be sure to use -mt and/or 
+ *   of platforms where this is the case.  Be sure to use -mt and/or
  *   -D_REENTRANT when compiling.
  */
 #ifdef SOLARIS_THREADS
@@ -156,7 +150,7 @@ _glthread_GetTSD(_glthread_TSD *tsd)
 #ifdef USE_LOCK_FOR_KEY
    mutex_lock(&tsd->keylock);
    thr_getspecific(tsd->key, &ret);
-   mutex_unlock(&tsd->keylock); 
+   mutex_unlock(&tsd->keylock);
 #else
    if ((errno = thr_getspecific(tsd->key, &ret)) != 0) {
       perror(GET_TSD_ERROR);
@@ -188,14 +182,26 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
  * 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
+ */
+#ifdef WIN32_THREADS
+
+void FreeTSD(_glthread_TSD *p)
+{
+   if (p->initMagic==INIT_MAGIC) {
+      TlsFree(p->key);
+      p->initMagic=0;
+   }
+}
+
+void InsteadOf_exit(int nCode)
+{
+   DWORD dwErr=GetLastError();
+}
 
 unsigned long
 _glthread_GetID(void)
 {
-   abort();   /* XXX not implemented yet */
-   return (unsigned long) 0;
+   return GetCurrentThreadId();
 }
 
 
@@ -203,11 +209,9 @@ void
 _glthread_InitTSD(_glthread_TSD *tsd)
 {
    tsd->key = TlsAlloc();
-   if (tsd->key == 0xffffffff) {
-      /* Can Windows handle stderr messages for non-console
-         applications? Does Windows have perror? */
-      /* perror(SET_INIT_ERROR);*/
-      exit(-1);
+   if (tsd->key == TLS_OUT_OF_INDEXES) {
+      perror("Mesa:_glthread_InitTSD");
+      InsteadOf_exit(-1);
    }
    tsd->initMagic = INIT_MAGIC;
 }
@@ -232,14 +236,12 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
       _glthread_InitTSD(tsd);
    }
    if (TlsSetValue(tsd->key, ptr) == 0) {
-      /* Can Windows handle stderr messages for non-console
-         applications? Does Windows have perror? */
-      /* perror(SET_TSD_ERROR);*/
-      exit(-1);
+         perror("Mesa:_glthread_SetTSD");
+         InsteadOf_exit(-1);
    }
 }
 
-#endif /* WIN32 */
+#endif /* WIN32_THREADS */
 
 
 
@@ -247,7 +249,7 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
  * XFree86 has its own thread wrapper, Xthreads.h
  * We wrap it again for GL.
  */
-#ifdef XTHREADS
+#ifdef USE_XTHREADS
 
 unsigned long
 _glthread_GetID(void)
@@ -292,6 +294,46 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
 
 
 
+/*
+ * BeOS threads
+ */
+#ifdef BEOS_THREADS
+
+unsigned long
+_glthread_GetID(void)
+{
+   return (unsigned long) find_thread(NULL);
+}
+
+void
+_glthread_InitTSD(_glthread_TSD *tsd)
+{
+   tsd->key = tls_allocate();
+   tsd->initMagic = INIT_MAGIC;
+}
+
+void *
+_glthread_GetTSD(_glthread_TSD *tsd)
+{
+   if (tsd->initMagic != (int) INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   return tls_get(tsd->key);
+}
+
+void
+_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
+{
+   if (tsd->initMagic != (int) INIT_MAGIC) {
+      _glthread_InitTSD(tsd);
+   }
+   tls_set(tsd->key, ptr);
+}
+
+#endif /* BEOS_THREADS */
+
+
+
 #else  /* THREADS */