Changeset 2970 for trunk/src/opengl

Timestamp:

Mar 2, 2000, 2:27:30 PM (25 years ago)

Author:

sandervl

Message:

Reapplied TLS fixes

Location:

trunk/src/opengl/mesa

Files:

• context.c (modified) (3 diffs)
• context.h (modified) (2 diffs)
• mthreads.h (modified) (3 diffs)
• osmesa.c (modified) (2 diffs)

trunk/src/opengl/mesa/context.c

@@ -1 @@
-/* $Id: context.c,v 1.2 2000-03-01 18:49:25 jeroen Exp $ */
+/* $Id: context.c,v 1.3 2000-03-02 13:27:30 sandervl Exp $ */
 
 /*
@@ -149 +149 @@
 #include "mthreads.h"        /* Mesa platform independent threads interface*/
 
+#ifdef __WIN32OS2__
+//SvL: Initialize this struct
+static MesaTSD mesa_ctx_tsd = {-1, -1};
+#else
 static MesaTSD mesa_ctx_tsd;
+#endif
 
 static void mesa_ctx_thread_init() {
@@ -156 +161 @@
 
 GLcontext *gl_get_thread_context( void ) {
+#ifdef __WIN32OS2__
+  return (GLcontext *) MesaGetTSD(&mesa_ctx_tsd, mesa_ctx_thread_init);
+#else
   return (GLcontext *) MesaGetTSD(&mesa_ctx_tsd);
+#endif
 }
 

trunk/src/opengl/mesa/context.h

@@ -1 @@
-/* $Id: context.h,v 1.2 2000-03-01 18:49:25 jeroen Exp $ */
+/* $Id: context.h,v 1.3 2000-03-02 13:27:30 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 
 
-                                       /* #include "types.h"               */
+#include "types.h"
 
 #ifdef THREADS

trunk/src/opengl/mesa/mthreads.h

@@ -1 @@
-/* $Id: mthreads.h,v 1.1 2000-02-29 00:48:34 sandervl Exp $ */
+/* $Id: mthreads.h,v 1.2 2000-03-02 13:27:30 sandervl Exp $ */
 
 /*
@@ -127 +127 @@
 #if defined(WIN32) || defined(__WIN32OS2__)
 
-#ifdef __WIN32OS2__
-#include <os2win.h>
-#else
 #include <windows.h>
-#endif
 
 typedef struct {
@@ -150 +146 @@
  */
 void  MesaInitTSD(MesaTSD *);
+
+#ifdef __WIN32OS2__
+void *MesaGetTSD (MesaTSD * tsd, void (*initfunc)(void)) ;
+#else
 void* MesaGetTSD (MesaTSD *);
+#endif
 void  MesaSetTSD (MesaTSD *, void *, void (*initfunc)(void));
 

trunk/src/opengl/mesa/osmesa.c

@@ -1 @@
-/* $Id: osmesa.c,v 1.1 2000-03-01 18:49:33 jeroen Exp $ */
+/* $Id: osmesa.c,v 1.2 2000-03-02 13:27:30 sandervl Exp $ */
 
 /*
@@ -82 +82 @@
 
 static OSMesaContext osmesa_get_thread_context( void ) {
+#ifdef __WIN32OS2__
+  return (OSMesaContext) MesaGetTSD(&osmesa_ctx_tsd, osmesa_ctx_thread_init);
+#else
   return (OSMesaContext) MesaGetTSD(&osmesa_ctx_tsd);
+#endif
 }