diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 1999-12-17 12:21:38 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 1999-12-17 12:21:38 +0000 |
| commit | c633693a28caa6ba09bb04e283b485f54f4d498e (patch) | |
| tree | 6a7b986b1fda117cfdbf2d92fa9e6d49371084b6 /src/mesa/main/context.h | |
| parent | 590d34726d96bbe238c4c1d1b09ab5e905c4ca73 (diff) | |
fixed thread problems
Diffstat (limited to 'src/mesa/main/context.h')
| -rw-r--r-- | src/mesa/main/context.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 32dd613c14..76ac1bb327 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -1,4 +1,4 @@ -/* $Id: context.h,v 1.5 1999/12/10 19:09:22 brianp Exp $ */ +/* $Id: context.h,v 1.6 1999/12/17 12:21:39 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -116,27 +116,25 @@ extern GLcontext *gl_get_current_context(void); #ifdef THREADS - /* - * A seperate GLcontext for each thread - */ - - #define GET_CURRENT_CONTEXT(C) GLcontext *C = gl_get_current_context() +/* + * A seperate GLcontext for each thread + */ +#define GET_CURRENT_CONTEXT(C) GLcontext *C = gl_get_current_context() #define GET_IMMEDIATE struct immediate *IM = (gl_get_current_context())->input; #define SET_IMMEDIATE(ctx, im) \ do { \ ctx->input = im; \ } while (0) - #else - /* - * All threads use same pointer to current context. - */ - extern GLcontext *_mesa_current_context; - extern struct immediate *CURRENT_INPUT; - #define GET_CURRENT_CONTEXT(C) GLcontext *C = _mesa_current_context +/* + * All threads use same pointer to current context. + */ +extern GLcontext *_mesa_current_context; +extern struct immediate *CURRENT_INPUT; +#define GET_CURRENT_CONTEXT(C) GLcontext *C = _mesa_current_context #define GET_IMMEDIATE struct immediate *IM = CURRENT_INPUT #define SET_IMMEDIATE(ctx, im) \ do { \ @@ -144,7 +142,6 @@ do { \ CURRENT_INPUT = im; \ } while (0) - #endif |