From eae73dbd916d3109224fdb938120acd1abb6b646 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 4 Sep 2005 15:01:33 +0000 Subject: Use InitPointers helper --- src/mesa/drivers/dri/r300/radeon_span.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'src/mesa/drivers/dri/r300') diff --git a/src/mesa/drivers/dri/r300/radeon_span.c b/src/mesa/drivers/dri/r300/radeon_span.c index 7703e4ac32..547ac3daaf 100644 --- a/src/mesa/drivers/dri/r300/radeon_span.c +++ b/src/mesa/drivers/dri/r300/radeon_span.c @@ -259,17 +259,16 @@ static void radeonSpanRenderStart(GLcontext * ctx) int p; driRenderbuffer *drb = (driRenderbuffer *) ctx->WinSysDrawBuffer->_ColorDrawBuffers[0][0]; - volatile int *read_buf = + volatile int *buf = (volatile int *)(radeon->dri.screen->pFB + drb->offset); - p = *read_buf; - *read_buf = p; + p = *buf; + *buf = p; } } static void radeonSpanRenderFinish(GLcontext * ctx) { radeonContextPtr radeon = RADEON_CONTEXT(ctx); - _swrast_flush(ctx); UNLOCK_HARDWARE(radeon); } @@ -289,22 +288,10 @@ void radeonSetSpanFunctions(driRenderbuffer *drb, const GLvisual *vis) { if (drb->Base.InternalFormat == GL_RGBA) { if (vis->redBits == 5 && vis->greenBits == 6 && vis->blueBits == 5) { - drb->Base.GetRow = radeonReadRGBASpan_RGB565; - drb->Base.GetValues = radeonReadRGBAPixels_RGB565; - drb->Base.PutRow = radeonWriteRGBASpan_RGB565; - drb->Base.PutRowRGB = radeonWriteRGBSpan_RGB565; - drb->Base.PutMonoRow = radeonWriteMonoRGBASpan_RGB565; - drb->Base.PutValues = radeonWriteRGBAPixels_RGB565; - drb->Base.PutMonoValues = radeonWriteMonoRGBAPixels_RGB565; + radeonInitPointers_RGB565(&drb->Base); } else { - drb->Base.GetRow = radeonReadRGBASpan_ARGB8888; - drb->Base.GetValues = radeonReadRGBAPixels_ARGB8888; - drb->Base.PutRow = radeonWriteRGBASpan_ARGB8888; - drb->Base.PutRowRGB = radeonWriteRGBSpan_ARGB8888; - drb->Base.PutMonoRow = radeonWriteMonoRGBASpan_ARGB8888; - drb->Base.PutValues = radeonWriteRGBAPixels_ARGB8888; - drb->Base.PutMonoValues = radeonWriteMonoRGBAPixels_ARGB8888; + radeonInitPointers_ARGB8888(&drb->Base); } } else if (drb->Base.InternalFormat == GL_DEPTH_COMPONENT16) { -- cgit v1.2.3