diff options
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r-- | src/mesa/drivers/dos/dmesa.c | 39 | ||||
-rw-r--r-- | src/mesa/drivers/glide/fxapi.c | 5 | ||||
-rw-r--r-- | src/mesa/drivers/glide/fxddtex.c | 2 |
3 files changed, 33 insertions, 13 deletions
diff --git a/src/mesa/drivers/dos/dmesa.c b/src/mesa/drivers/dos/dmesa.c index c7c8fcff84..752f13e909 100644 --- a/src/mesa/drivers/dos/dmesa.c +++ b/src/mesa/drivers/dos/dmesa.c @@ -807,7 +807,7 @@ static const GLubyte* get_string (GLcontext *ctx, GLenum name) switch (name) { case GL_RENDERER: return (const GLubyte *)"Mesa DJGPP" - "\0port (c) Borca Daniel dec-2003"; + "\0port (c) Borca Daniel feb-2004"; default: return NULL; } @@ -1137,8 +1137,8 @@ void DMesaDestroyBuffer (DMesaBuffer b) DMesaContext DMesaCreateContext (DMesaVisual visual, DMesaContext share) { -#ifndef FX GLcontext *c; +#ifndef FX TNLcontext *tnl; struct dd_function_table functions; @@ -1177,11 +1177,11 @@ DMesaContext DMesaCreateContext (DMesaVisual visual, _swsetup_Wakeup(c); } - return (DMesaContext)c; - #else /* FX */ - return (DMesaContext)visual; + c = (GLcontext *)0xdeadbeef; #endif /* FX */ + + return (DMesaContext)c; } @@ -1292,13 +1292,34 @@ void DMesaSetCI (int ndx, GLfloat red, GLfloat green, GLfloat blue) -void *DMesaGetCurrentContext (void) +DMesaContext DMesaGetCurrentContext (void) { -#ifndef FX GET_CURRENT_CONTEXT(ctx); - return ctx; + +#ifndef FX +#else + if (ctx != NULL) { + ctx = (GLcontext *)0xdeadbeef; + } +#endif + + return (DMesaContext)ctx; +} + + + +DMesaBuffer DMesaGetCurrentBuffer (void) +{ + const DMesaContext dmesa = DMesaGetCurrentContext(); + + if (dmesa == NULL) { + return NULL; + } + +#ifndef FX + return dmesa->buffer; #else - return fxMesaGetCurrentContext(); + return (DMesaBuffer)fxMesaGetCurrentContext(); #endif } diff --git a/src/mesa/drivers/glide/fxapi.c b/src/mesa/drivers/glide/fxapi.c index 61c69853e6..8ffa36c9c3 100644 --- a/src/mesa/drivers/glide/fxapi.c +++ b/src/mesa/drivers/glide/fxapi.c @@ -147,10 +147,9 @@ GLint GLAPIENTRY fxMesaSelectCurrentBoard (int n) } -void * GLAPIENTRY fxMesaGetCurrentContext (void) +fxMesaContext GLAPIENTRY fxMesaGetCurrentContext (void) { - GET_CURRENT_CONTEXT(ctx); - return ctx; + return fxMesaCurrentCtx; } diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c index 17ff082696..baaba8e6e3 100644 --- a/src/mesa/drivers/glide/fxddtex.c +++ b/src/mesa/drivers/glide/fxddtex.c @@ -1257,7 +1257,7 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level, } } #endif -#if 1 || FX_COMPRESS_DXT5_AS_DXT3_HACK +#if 0 && FX_COMPRESS_DXT5_AS_DXT3_HACK /* [dBorca] either VSA is stupid at DXT5, * or our compression tool is broken. See * above for caveats. |