From b0715811e8c100a2686ee2363e2f94c734565d60 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 3 Sep 2005 16:48:48 +0000 Subject: [PATCH] remove dead code --- src/mesa/drivers/dri/r200/r200_span.c | 98 +++------------------------------- src/mesa/drivers/dri/r200/r200_state.c | 16 ------ 2 files changed, 7 insertions(+), 107 deletions(-) diff --git a/src/mesa/drivers/dri/r200/r200_span.c b/src/mesa/drivers/dri/r200/r200_span.c index 898ff61e76a..8de41332e4b 100644 --- a/src/mesa/drivers/dri/r200/r200_span.c +++ b/src/mesa/drivers/dri/r200/r200_span.c @@ -49,25 +49,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define GET_PTR(X,Y) (sPriv->pFB + drb->flippedOffset \ + ((dPriv->y + (Y)) * drb->flippedPitch + (dPriv->x + (X))) * drb->cpp) -#if 000 -#define LOCAL_VARS \ - r200ContextPtr rmesa = R200_CONTEXT(ctx); \ - r200ScreenPtr r200Screen = rmesa->r200Screen; \ - __DRIscreenPrivate *sPriv = rmesa->dri.screen; \ - __DRIdrawablePrivate *dPriv = rmesa->dri.drawable; \ - GLuint pitch = r200Screen->frontPitch * r200Screen->cpp; \ - GLuint height = dPriv->h; \ - char *buf = (char *)(sPriv->pFB + \ - rmesa->state.color.drawOffset + \ - (dPriv->x * r200Screen->cpp) + \ - (dPriv->y * pitch)); \ - char *read_buf = (char *)(sPriv->pFB + \ - rmesa->state.pixel.readOffset + \ - (dPriv->x * r200Screen->cpp) + \ - (dPriv->y * pitch)); \ - GLuint p; \ - (void) read_buf; (void) buf; (void) p -#else #define LOCAL_VARS \ r200ContextPtr rmesa = R200_CONTEXT(ctx); \ __DRIscreenPrivate *sPriv = rmesa->dri.screen; \ @@ -76,7 +57,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. GLuint height = dPriv->h; \ GLuint p; \ (void) p; -#endif #define LOCAL_DEPTH_VARS \ r200ContextPtr rmesa = R200_CONTEXT(ctx); \ @@ -138,6 +118,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * are set up correctly. It is not quite enough to get it working with hyperz too... */ +/* extract bit 'b' of x, result is zero or one */ #define BIT(x,b) ((x & (1<>b) static GLuint @@ -201,7 +182,7 @@ r200_mba_z16( driRenderbuffer *drb, GLint x, GLint y ) #define READ_DEPTH( d, _x, _y ) \ d = *(GLushort *)(buf + r200_mba_z16( drb, _x + xo, _y + yo )); -#define TAG(x) r200##x##_16 +#define TAG(x) r200##x##_z16 #include "depthtmp.h" @@ -221,7 +202,7 @@ do { \ d = *(GLuint *)(buf + r200_mba_z32( drb, _x + xo, \ _y + yo )) & 0x00ffffff; -#define TAG(x) r200##x##_24_8 +#define TAG(x) r200##x##_z24_s8 #include "depthtmp.h" @@ -248,56 +229,10 @@ do { \ d = tmp >> 24; \ } while (0) -#define TAG(x) r200##x##_24_8 +#define TAG(x) r200##x##_z24_s8 #include "stenciltmp.h" -#if 000 -/* - * This function is called to specify which buffer to read and write - * for software rasterization (swrast) fallbacks. This doesn't necessarily - * correspond to glDrawBuffer() or glReadBuffer() calls. - */ -static void r200SetBuffer( GLcontext *ctx, - GLframebuffer *colorBuffer, - GLuint bufferBit ) -{ - r200ContextPtr rmesa = R200_CONTEXT(ctx); - - switch ( bufferBit ) { - case BUFFER_BIT_FRONT_LEFT: - if ( rmesa->doPageFlip && rmesa->sarea->pfCurrentPage == 1 ) { - rmesa->state.pixel.readOffset = rmesa->r200Screen->backOffset; - rmesa->state.pixel.readPitch = rmesa->r200Screen->backPitch; - rmesa->state.color.drawOffset = rmesa->r200Screen->backOffset; - rmesa->state.color.drawPitch = rmesa->r200Screen->backPitch; - } else { - rmesa->state.pixel.readOffset = rmesa->r200Screen->frontOffset; - rmesa->state.pixel.readPitch = rmesa->r200Screen->frontPitch; - rmesa->state.color.drawOffset = rmesa->r200Screen->frontOffset; - rmesa->state.color.drawPitch = rmesa->r200Screen->frontPitch; - } - break; - case BUFFER_BIT_BACK_LEFT: - if ( rmesa->doPageFlip && rmesa->sarea->pfCurrentPage == 1 ) { - rmesa->state.pixel.readOffset = rmesa->r200Screen->frontOffset; - rmesa->state.pixel.readPitch = rmesa->r200Screen->frontPitch; - rmesa->state.color.drawOffset = rmesa->r200Screen->frontOffset; - rmesa->state.color.drawPitch = rmesa->r200Screen->frontPitch; - } else { - rmesa->state.pixel.readOffset = rmesa->r200Screen->backOffset; - rmesa->state.pixel.readPitch = rmesa->r200Screen->backPitch; - rmesa->state.color.drawOffset = rmesa->r200Screen->backOffset; - rmesa->state.color.drawPitch = rmesa->r200Screen->backPitch; - } - break; - default: - _mesa_problem(ctx, "Bad bufferBit in %s", __FUNCTION__); - break; - } -} -#endif - /* Move locking out to get reasonable span performance (10x better * than doing this in HW_LOCK above). WaitForIdle() is the main * culprit. @@ -341,10 +276,6 @@ static void r200SpanRenderFinish( GLcontext *ctx ) void r200InitSpanFuncs( GLcontext *ctx ) { struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx); - -#if 000 - swdd->SetBuffer = r200SetBuffer; -#endif swdd->SpanRenderStart = r200SpanRenderStart; swdd->SpanRenderFinish = r200SpanRenderFinish; } @@ -366,27 +297,12 @@ r200SetSpanFunctions(driRenderbuffer *drb, const GLvisual *vis) } } else if (drb->Base.InternalFormat == GL_DEPTH_COMPONENT16) { - drb->Base.GetRow = r200ReadDepthSpan_16; - drb->Base.GetValues = r200ReadDepthPixels_16; - drb->Base.PutRow = r200WriteDepthSpan_16; - drb->Base.PutMonoRow = r200WriteMonoDepthSpan_16; - drb->Base.PutValues = r200WriteDepthPixels_16; - drb->Base.PutMonoValues = NULL; + r200InitDepthPointers_z16(&drb->Base); } else if (drb->Base.InternalFormat == GL_DEPTH_COMPONENT24) { - drb->Base.GetRow = r200ReadDepthSpan_24_8; - drb->Base.GetValues = r200ReadDepthPixels_24_8; - drb->Base.PutRow = r200WriteDepthSpan_24_8; - drb->Base.PutMonoRow = r200WriteMonoDepthSpan_24_8; - drb->Base.PutValues = r200WriteDepthPixels_24_8; - drb->Base.PutMonoValues = NULL; + r200InitDepthPointers_z24_s8(&drb->Base); } else if (drb->Base.InternalFormat == GL_STENCIL_INDEX8_EXT) { - drb->Base.GetRow = r200ReadStencilSpan_24_8; - drb->Base.GetValues = r200ReadStencilPixels_24_8; - drb->Base.PutRow = r200WriteStencilSpan_24_8; - drb->Base.PutMonoRow = r200WriteMonoStencilSpan_24_8; - drb->Base.PutValues = r200WriteStencilPixels_24_8; - drb->Base.PutMonoValues = NULL; + r200InitStencilPointers_z24_s8(&drb->Base); } } diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 36dd9ca8870..31f1c79b855 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -1813,25 +1813,9 @@ static void r200DrawBuffer( GLcontext *ctx, GLenum mode ) return; } -#if 000 - /* We want to update the s/w rast state too so that r200SetBuffer() - * gets called. - */ - _swrast_DrawBuffer(ctx, mode); - - R200_STATECHANGE( rmesa, ctx ); - rmesa->hw.ctx.cmd[CTX_RB3D_COLOROFFSET] = ((rmesa->state.color.drawOffset + - rmesa->r200Screen->fbLocation) - & R200_COLOROFFSET_MASK); - rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] = rmesa->state.color.drawPitch; - if (rmesa->sarea->tiling_enabled) { - rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] |= R200_COLOR_TILE_ENABLE; - } -#else /* We'll set the drawing engine's offset/pitch parameters later * when we update other state. */ -#endif } -- 2.11.0