From 894844a8d956a0ee5f95836331dc318f49fdb845 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 21 Mar 2004 17:05:03 +0000 Subject: Implemented support for software-based AUX color buffers. Only available with Xlib driver for now. Assorted clean-ups related to Draw/ReadBuffer(). Renamed FRONT_LEFT_BIT -> DD_FRONT_LEFT_BIT, etc. --- src/mesa/drivers/dri/mach64/mach64_lock.c | 2 +- src/mesa/drivers/dri/mach64/mach64_span.c | 8 ++++---- src/mesa/drivers/dri/mach64/mach64_state.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/mesa/drivers/dri/mach64') diff --git a/src/mesa/drivers/dri/mach64/mach64_lock.c b/src/mesa/drivers/dri/mach64/mach64_lock.c index 465bcb3ab8..f95c1595cd 100644 --- a/src/mesa/drivers/dri/mach64/mach64_lock.c +++ b/src/mesa/drivers/dri/mach64/mach64_lock.c @@ -69,7 +69,7 @@ void mach64GetLock( mach64ContextPtr mmesa, GLuint flags ) if ( mmesa->lastStamp != dPriv->lastStamp ) { mmesa->lastStamp = dPriv->lastStamp; - if (mmesa->glCtx->Color._DrawDestMask == BACK_LEFT_BIT) + if (mmesa->glCtx->Color._DrawDestMask == DD_BACK_LEFT_BIT) mach64SetCliprects( mmesa->glCtx, GL_BACK_LEFT ); else mach64SetCliprects( mmesa->glCtx, GL_FRONT_LEFT ); diff --git a/src/mesa/drivers/dri/mach64/mach64_span.c b/src/mesa/drivers/dri/mach64/mach64_span.c index 4c668ba90e..3e553a9094 100644 --- a/src/mesa/drivers/dri/mach64/mach64_span.c +++ b/src/mesa/drivers/dri/mach64/mach64_span.c @@ -200,15 +200,15 @@ static void mach64DDSetBuffer( GLcontext *ctx, mach64ContextPtr mmesa = MACH64_CONTEXT(ctx); switch ( bufferBit ) { - case FRONT_LEFT_BIT: + case DD_FRONT_LEFT_BIT: if (MACH64_DEBUG & DEBUG_VERBOSE_MSG) - fprintf(stderr,"%s: FRONT_LEFT_BIT\n", __FUNCTION__); + fprintf(stderr,"%s: DD_FRONT_LEFT_BIT\n", __FUNCTION__); mmesa->drawOffset = mmesa->readOffset = mmesa->mach64Screen->frontOffset; mmesa->drawPitch = mmesa->readPitch = mmesa->mach64Screen->frontPitch; break; - case BACK_LEFT_BIT: + case DD_BACK_LEFT_BIT: if (MACH64_DEBUG & DEBUG_VERBOSE_MSG) - fprintf(stderr,"%s: BACK_LEFT_BIT\n", __FUNCTION__); + fprintf(stderr,"%s: DD_BACK_LEFT_BIT\n", __FUNCTION__); mmesa->drawOffset = mmesa->readOffset = mmesa->mach64Screen->backOffset; mmesa->drawPitch = mmesa->readPitch = mmesa->mach64Screen->backPitch; break; diff --git a/src/mesa/drivers/dri/mach64/mach64_state.c b/src/mesa/drivers/dri/mach64/mach64_state.c index 9c37d85490..f81e91a3c9 100644 --- a/src/mesa/drivers/dri/mach64/mach64_state.c +++ b/src/mesa/drivers/dri/mach64/mach64_state.c @@ -730,17 +730,17 @@ static void mach64DDDrawBuffer( GLcontext *ctx, GLenum mode ) * _DrawDestMask is easier to cope with than . */ switch ( ctx->Color._DrawDestMask ) { - case FRONT_LEFT_BIT: + case DD_FRONT_LEFT_BIT: FALLBACK( mmesa, MACH64_FALLBACK_DRAW_BUFFER, GL_FALSE ); mach64SetCliprects( ctx, GL_FRONT_LEFT ); if (MACH64_DEBUG & DEBUG_VERBOSE_MSG) - fprintf(stderr,"%s: FRONT_LEFT_BIT\n", __FUNCTION__); + fprintf(stderr,"%s: DD_FRONT_LEFT_BIT\n", __FUNCTION__); break; - case BACK_LEFT_BIT: + case DD_BACK_LEFT_BIT: FALLBACK( mmesa, MACH64_FALLBACK_DRAW_BUFFER, GL_FALSE ); mach64SetCliprects( ctx, GL_BACK_LEFT ); if (MACH64_DEBUG & DEBUG_VERBOSE_MSG) - fprintf(stderr,"%s: BACK_LEFT_BIT\n", __FUNCTION__); + fprintf(stderr,"%s: DD_BACK_LEFT_BIT\n", __FUNCTION__); break; default: /* GL_NONE or GL_FRONT_AND_BACK or stereo left&right, etc */ -- cgit v1.2.3