diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-01-28 20:17:42 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-01-28 20:17:42 +0000 |
| commit | f9b97d95f9bf9286107586d6afdadae74bb94d36 (patch) | |
| tree | 4fa4c2845f5944c4bf8d41981ea297c736f2e4f2 /src/mesa/main | |
| parent | 9f94399cf331b5b81ef5dee86b0ef02d131337c6 (diff) | |
renamed _glapi_CurrentContext to _glapi_Context
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/context.c | 9 | ||||
| -rw-r--r-- | src/mesa/main/context.h | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index f654334e9e..4525d45c86 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.35 2000/01/28 19:02:22 brianp Exp $ */ +/* $Id: context.c,v 1.36 2000/01/28 20:17:42 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -43,6 +43,7 @@ #include "fog.h" #include "get.h" #include "glapi.h" +#include "glapinoop.h" #include "hash.h" #include "light.h" #include "lines.h" @@ -1619,7 +1620,7 @@ void gl_make_current2( GLcontext *newCtx, GLframebuffer *drawBuffer, GLframebuffer *readBuffer ) { #if 0 - GLcontext *oldCtx = gl_get_current_context(); + GLcontext *oldCtx = gl_get_context(); /* Flush the old context */ @@ -1641,7 +1642,7 @@ void gl_make_current2( GLcontext *newCtx, GLframebuffer *drawBuffer, */ _glapi_check_multithread(); - _glapi_set_current_context((void *) newCtx); + _glapi_set_context((void *) newCtx); ASSERT(gl_get_current_context() == newCtx); if (newCtx) { SET_IMMEDIATE(newCtx, newCtx->input); @@ -1696,7 +1697,7 @@ void gl_make_current2( GLcontext *newCtx, GLframebuffer *drawBuffer, */ GLcontext *gl_get_current_context( void ) { - return (GLcontext *) _glapi_get_current_context(); + return (GLcontext *) _glapi_get_context(); } diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 97e9d6a808..192549da90 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -1,4 +1,4 @@ -/* $Id: context.h,v 1.11 2000/01/18 17:36:16 brianp Exp $ */ +/* $Id: context.h,v 1.12 2000/01/28 20:17:42 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -129,9 +129,9 @@ extern GLcontext *gl_get_current_context(void); */ #ifdef THREADS -#define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) (_glapi_CurrentContext ? _glapi_CurrentContext : _glapi_get_current_context()) +#define GET_CURRENT_CONTEXT(C) GLcontext *C = (GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context()) -#define GET_IMMEDIATE struct immediate *IM = ((GLcontext *) (_glapi_CurrentContext ? _glapi_CurrentContext : _glapi_get_current_context()))->input +#define GET_IMMEDIATE struct immediate *IM = ((GLcontext *) (_glapi_Context ? _glapi_Context : _glapi_get_context()))->input #define SET_IMMEDIATE(ctx, im) \ do { \ @@ -142,7 +142,7 @@ do { \ extern struct immediate *_mesa_CurrentInput; -#define GET_CURRENT_CONTEXT(C) GLcontext *C = _glapi_CurrentContext +#define GET_CURRENT_CONTEXT(C) GLcontext *C = _glapi_Context #define GET_IMMEDIATE struct immediate *IM = _mesa_CurrentInput |