fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-30 16:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

THREADS now defined by glthread.h, added more prototypes

Browse source
This commit is contained in:
Brian Paul 2000-02-10 21:54:06 +00:00
parent 3c27be3738
commit a360ab2a33
2 changed files with 51 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/mesa/glapi/glthread.c
View file

@ -1,4 +1,4 @@
/* $Id: glthread.c,v 1.4 2000/02/10 21:27:25 brianp Exp $ */
/* $Id: glthread.c,v 1.5 2000/02/10 21:54:06 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -35,18 +35,16 @@
#include "all.h"
#else
#include "glheader.h"
#include "glthread.h"
#endif
/*
* 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>
#include "glthread.h"
/*
* Error messages
@ -293,6 +291,42 @@ _glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
#endif /* XTHREAD */
#else /* THREADS */
/*
* no-op functions
*/
unsigned long
_glthread_GetID(void)
{
return 0;
}
void
_glthread_InitTSD(_glthread_TSD *tsd)
{
(void) tsd;
}
void *
_glthread_GetTSD(_glthread_TSD *tsd)
{
(void) tsd;
return NULL;
}
void
_glthread_SetTSD(_glthread_TSD *tsd, void *ptr)
{
(void) tsd;
(void) ptr;
}
#endif /* THREADS */

27
src/mesa/glapi/glthread.h
View file

@ -1,4 +1,4 @@
/* $Id: glthread.h,v 1.3 2000/02/10 21:27:25 brianp Exp $ */
/* $Id: glthread.h,v 1.4 2000/02/10 21:54:06 brianp Exp $ */
/*
* Mesa 3-D graphics library
@ -56,22 +56,19 @@
*
*/
#ifndef GLTHREAD_H
#define GLTHREAD_H
/*
* 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.
*/
#ifdef THREADS
/*
* It is an error not to select a specific threads API when compiling.
*/
#if !defined(PTHREADS) && !defined(SOLARIS_THREADS) && !defined(WIN32) && !defined(XTHREADS)
#error One of PTHREADS, SOLARIS_THREADS, WIN32 or XTHREADS must be defined.
#ifndef GLTHREAD_H
#define GLTHREAD_H
#if defined(PTHREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || defined(XTHREADS)
#define THREADS
#endif
@ -85,7 +82,7 @@
* compiler flag. On Solaris with gcc, use -D_REENTRANT to enable
* proper compiling for MT-safe libc etc.
*/
#ifdef PTHREADS
#if defined(PTHREADS)
#include <pthread.h> /* POSIX threads headers */
typedef struct {
@ -204,8 +201,8 @@ typedef xmutex_rec _glthread_Mutex;
#else /* THREADS */
#ifndef THREADS
/*
* THREADS not defined
@ -225,7 +222,6 @@ typedef GLuint _glthread_Mutex;
#define _glthread_UNLOCK_MUTEX(name) (void) name
#endif /* THREADS */
@ -251,6 +247,5 @@ _glthread_SetTSD(_glthread_TSD *, void *);
#endif /* THREADS_H */