From 687918b794d12a0ff5d395b8cf87880dbe8012bf Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Sat, 3 Sep 2005 16:43:02 +0000
Subject: SetBuffer, renderbuffer changes

---
 src/mesa/drivers/dri/tdfx/tdfx_span.c | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

(limited to 'src/mesa/drivers/dri/tdfx/tdfx_span.c')

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_span.c b/src/mesa/drivers/dri/tdfx/tdfx_span.c
index b00b7ad8db..142beb404f 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_span.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_span.c
@@ -49,9 +49,10 @@
 #define LOCAL_VARS							\
    __DRIdrawablePrivate *dPriv = fxMesa->driDrawable;			\
    tdfxScreenPrivate *fxPriv = fxMesa->fxScreen;			\
-   GLuint pitch = (fxMesa->glCtx->Color.DrawBuffer[0] == GL_FRONT)         \
-               ? (fxMesa->screen_width * BYTESPERPIXEL) :               \
-               (info.strideInBytes);                                    \
+   GLboolean isFront = (ctx->DrawBuffer->_ColorDrawBufferMask[0]	\
+                      == BUFFER_BIT_FRONT_LEFT);			\
+   GLuint pitch = isFront ? (fxMesa->screen_width * BYTESPERPIXEL)	\
+                          : info.strideInBytes;				\
    GLuint height = fxMesa->height;					\
    char *buf = (char *)((char *)info.lfbPtr +				\
 			 dPriv->x * fxPriv->cpp +			\
@@ -1334,25 +1335,6 @@ static void tdfxSpanRenderFinish( GLcontext *ctx )
    UNLOCK_HARDWARE(fxMesa);
 }
 
-/* Set the buffer used for reading */
-static void tdfxDDSetBuffer( GLcontext *ctx,
-                             GLframebuffer *buffer, GLuint bufferBit )
-{
-   tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
-   (void) buffer;
-
-   switch ( bufferBit ) {
-   case BUFFER_BIT_FRONT_LEFT:
-      fxMesa->DrawBuffer = fxMesa->ReadBuffer = GR_BUFFER_FRONTBUFFER;
-      break;
-   case BUFFER_BIT_BACK_LEFT:
-      fxMesa->DrawBuffer = fxMesa->ReadBuffer = GR_BUFFER_BACKBUFFER;
-      break;
-   default:
-      break;
-   }
-}
-
 /**********************************************************************/
 /*                    Initialize swrast device driver                 */
 /**********************************************************************/
@@ -1360,7 +1342,6 @@ static void tdfxDDSetBuffer( GLcontext *ctx,
 void tdfxDDInitSpanFuncs( GLcontext *ctx )
 {
    struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference( ctx );
-   swdd->SetBuffer = tdfxDDSetBuffer;
    swdd->SpanRenderStart          = tdfxSpanRenderStart;
    swdd->SpanRenderFinish         = tdfxSpanRenderFinish; 
 }
-- 
cgit v1.2.3