diff options
| author | Daniel Borca <dborca@users.sourceforge.net> | 2004-02-10 07:46:07 +0000 |
|---|---|---|
| committer | Daniel Borca <dborca@users.sourceforge.net> | 2004-02-10 07:46:07 +0000 |
| commit | 22633805fa4edf5771a4aa951de947e3346f76be (patch) | |
| tree | d42f839120616b2dcce246ed260da3d16168f3bd /src/mesa/drivers/glide | |
| parent | a1b9b1a4409729fa8b6714e5847544576fcee404 (diff) | |
fixed back fxMesaGetCurrentContext to match MakeCurrent
Diffstat (limited to 'src/mesa/drivers/glide')
| -rw-r--r-- | src/mesa/drivers/glide/fxapi.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/glide/fxddtex.c | 2 |
2 files changed, 3 insertions, 4 deletions
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. |