From 758f334717eaf6700defcde126cb9194155a2264 Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Fri, 1 Jul 2005 11:28:14 +0000 Subject: [PATCH] convert sis and radeon driver to use spantmp2 instead of spantmp template. Remove old (pre-renderbuffer) span code instead of converting that too. Remove this old code from mach64 (the dead code was not fully converted to spantmp2 previously) too. --- src/mesa/drivers/dri/mach64/mach64_span.c | 54 -------- src/mesa/drivers/dri/radeon/radeon_span.c | 135 ++----------------- src/mesa/drivers/dri/sis/sis_span.c | 155 +++------------------- 3 files changed, 27 insertions(+), 317 deletions(-) diff --git a/src/mesa/drivers/dri/mach64/mach64_span.c b/src/mesa/drivers/dri/mach64/mach64_span.c index 88863471d47..0ac0eeaa604 100644 --- a/src/mesa/drivers/dri/mach64/mach64_span.c +++ b/src/mesa/drivers/dri/mach64/mach64_span.c @@ -180,63 +180,9 @@ static void mach64SpanRenderFinish( GLcontext *ctx ) void mach64DDInitSpanFuncs( GLcontext *ctx ) { -#if 0 - mach64ContextPtr mmesa = MACH64_CONTEXT(ctx); -#endif struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx); swdd->SetBuffer = mach64DDSetBuffer; - -#if 0 - switch ( mmesa->mach64Screen->cpp ) { - case 2: - swdd->WriteRGBASpan = mach64WriteRGBASpan_RGB565; - swdd->WriteRGBSpan = mach64WriteRGBSpan_RGB565; - swdd->WriteMonoRGBASpan = mach64WriteMonoRGBASpan_RGB565; - swdd->WriteRGBAPixels = mach64WriteRGBAPixels_RGB565; - swdd->WriteMonoRGBAPixels = mach64WriteMonoRGBAPixels_RGB565; - swdd->ReadRGBASpan = mach64ReadRGBASpan_RGB565; - swdd->ReadRGBAPixels = mach64ReadRGBAPixels_RGB565; - break; - - case 4: - swdd->WriteRGBASpan = mach64WriteRGBASpan_ARGB8888; - swdd->WriteRGBSpan = mach64WriteRGBSpan_ARGB8888; - swdd->WriteMonoRGBASpan = mach64WriteMonoRGBASpan_ARGB8888; - swdd->WriteRGBAPixels = mach64WriteRGBAPixels_ARGB8888; - swdd->WriteMonoRGBAPixels = mach64WriteMonoRGBAPixels_ARGB8888; - swdd->ReadRGBASpan = mach64ReadRGBASpan_ARGB8888; - swdd->ReadRGBAPixels = mach64ReadRGBAPixels_ARGB8888; - - break; - - default: - break; - } -#endif - - /* Depth buffer is always 16 bit */ -#if 0 - swdd->ReadDepthSpan = mach64ReadDepthSpan_16; - swdd->WriteDepthSpan = mach64WriteDepthSpan_16; - swdd->ReadDepthPixels = mach64ReadDepthPixels_16; - swdd->WriteDepthPixels = mach64WriteDepthPixels_16; -#endif -#if 0 - /* No hardware stencil buffer */ - swdd->ReadStencilSpan = NULL; - swdd->WriteStencilSpan = NULL; - swdd->ReadStencilPixels = NULL; - swdd->WriteStencilPixels = NULL; - - swdd->WriteCI8Span = NULL; - swdd->WriteCI32Span = NULL; - swdd->WriteMonoCISpan = NULL; - swdd->WriteCI32Pixels = NULL; - swdd->WriteMonoCIPixels = NULL; - swdd->ReadCI32Span = NULL; - swdd->ReadCI32Pixels = NULL; -#endif swdd->SpanRenderStart = mach64SpanRenderStart; swdd->SpanRenderFinish = mach64SpanRenderFinish; } diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c index d5606d70a16..2d15078d6df 100644 --- a/src/mesa/drivers/dri/radeon/radeon_span.c +++ b/src/mesa/drivers/dri/radeon/radeon_span.c @@ -92,61 +92,21 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /* 16 bit, RGB565 color spanline and pixel functions */ -#define INIT_MONO_PIXEL(p, color) \ - p = PACK_COLOR_565( color[0], color[1], color[2] ) +#define SPANTMP_PIXEL_FMT GL_RGB +#define SPANTMP_PIXEL_TYPE GL_UNSIGNED_SHORT_5_6_5 -#define WRITE_RGBA( _x, _y, r, g, b, a ) \ - *(GLushort *)(buf + _x*2 + _y*pitch) = ((((int)r & 0xf8) << 8) | \ - (((int)g & 0xfc) << 3) | \ - (((int)b & 0xf8) >> 3)) - -#define WRITE_PIXEL( _x, _y, p ) \ - *(GLushort *)(buf + _x*2 + _y*pitch) = p - -#define READ_RGBA( rgba, _x, _y ) \ - do { \ - GLushort p = *(GLushort *)(read_buf + _x*2 + _y*pitch); \ - rgba[0] = ((p >> 8) & 0xf8) * 255 / 0xf8; \ - rgba[1] = ((p >> 3) & 0xfc) * 255 / 0xfc; \ - rgba[2] = ((p << 3) & 0xf8) * 255 / 0xf8; \ - rgba[3] = 0xff; \ - } while (0) - -#define TAG(x) radeon##x##_RGB565 -#include "spantmp.h" +#define TAG(x) radeon##x##_RGB565 +#define TAG2(x,y) radeon##x##_RGB565##y +#include "spantmp2.h" /* 32 bit, ARGB8888 color spanline and pixel functions */ -#undef INIT_MONO_PIXEL -#define INIT_MONO_PIXEL(p, color) \ - p = PACK_COLOR_8888( color[3], color[0], color[1], color[2] ) - -#define WRITE_RGBA( _x, _y, r, g, b, a ) \ -do { \ - *(GLuint *)(buf + _x*4 + _y*pitch) = ((b << 0) | \ - (g << 8) | \ - (r << 16) | \ - (a << 24) ); \ -} while (0) - -#define WRITE_PIXEL( _x, _y, p ) \ -do { \ - *(GLuint *)(buf + _x*4 + _y*pitch) = p; \ -} while (0) - -#define READ_RGBA( rgba, _x, _y ) \ -do { \ - volatile GLuint *ptr = (volatile GLuint *)(read_buf + _x*4 + _y*pitch); \ - GLuint p = *ptr; \ - rgba[0] = (p >> 16) & 0xff; \ - rgba[1] = (p >> 8) & 0xff; \ - rgba[2] = (p >> 0) & 0xff; \ - rgba[3] = (p >> 24) & 0xff; \ -} while (0) - -#define TAG(x) radeon##x##_ARGB8888 -#include "spantmp.h" +#define SPANTMP_PIXEL_FMT GL_BGRA +#define SPANTMP_PIXEL_TYPE GL_UNSIGNED_INT_8_8_8_8_REV +#define TAG(x) radeon##x##_ARGB8888 +#define TAG2(x,y) radeon##x##_ARGB8888##y +#include "spantmp2.h" /* ================================================================ @@ -337,68 +297,9 @@ static void radeonSpanRenderFinish( GLcontext *ctx ) void radeonInitSpanFuncs( GLcontext *ctx ) { - radeonContextPtr rmesa = RADEON_CONTEXT(ctx); struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx); swdd->SetBuffer = radeonSetBuffer; - - switch ( rmesa->radeonScreen->cpp ) { - case 2: -#if 0 - swdd->WriteRGBASpan = radeonWriteRGBASpan_RGB565; - swdd->WriteRGBSpan = radeonWriteRGBSpan_RGB565; - swdd->WriteMonoRGBASpan = radeonWriteMonoRGBASpan_RGB565; - swdd->WriteRGBAPixels = radeonWriteRGBAPixels_RGB565; - swdd->WriteMonoRGBAPixels = radeonWriteMonoRGBAPixels_RGB565; - swdd->ReadRGBASpan = radeonReadRGBASpan_RGB565; - swdd->ReadRGBAPixels = radeonReadRGBAPixels_RGB565; -#endif - break; - - case 4: -#if 0 - swdd->WriteRGBASpan = radeonWriteRGBASpan_ARGB8888; - swdd->WriteRGBSpan = radeonWriteRGBSpan_ARGB8888; - swdd->WriteMonoRGBASpan = radeonWriteMonoRGBASpan_ARGB8888; - swdd->WriteRGBAPixels = radeonWriteRGBAPixels_ARGB8888; - swdd->WriteMonoRGBAPixels = radeonWriteMonoRGBAPixels_ARGB8888; - swdd->ReadRGBASpan = radeonReadRGBASpan_ARGB8888; - swdd->ReadRGBAPixels = radeonReadRGBAPixels_ARGB8888; -#endif - break; - - default: - break; - } - - switch ( rmesa->glCtx->Visual.depthBits ) { - case 16: -#if 0 - swdd->ReadDepthSpan = radeonReadDepthSpan_16; - swdd->WriteDepthSpan = radeonWriteDepthSpan_16; - swdd->ReadDepthPixels = radeonReadDepthPixels_16; - swdd->WriteDepthPixels = radeonWriteDepthPixels_16; -#endif - break; - - case 24: -#if 0 - swdd->ReadDepthSpan = radeonReadDepthSpan_24_8; - swdd->WriteDepthSpan = radeonWriteDepthSpan_24_8; - swdd->ReadDepthPixels = radeonReadDepthPixels_24_8; - swdd->WriteDepthPixels = radeonWriteDepthPixels_24_8; - - swdd->ReadStencilSpan = radeonReadStencilSpan_24_8; - swdd->WriteStencilSpan = radeonWriteStencilSpan_24_8; - swdd->ReadStencilPixels = radeonReadStencilPixels_24_8; - swdd->WriteStencilPixels = radeonWriteStencilPixels_24_8; -#endif - break; - - default: - break; - } - swdd->SpanRenderStart = radeonSpanRenderStart; swdd->SpanRenderFinish = radeonSpanRenderFinish; } @@ -412,22 +313,10 @@ 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) { diff --git a/src/mesa/drivers/dri/sis/sis_span.c b/src/mesa/drivers/dri/sis/sis_span.c index 78ce74b8725..f0cf771d616 100644 --- a/src/mesa/drivers/dri/sis/sis_span.c +++ b/src/mesa/drivers/dri/sis/sis_span.c @@ -44,6 +44,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #define LOCAL_VARS \ sisContextPtr smesa = SIS_CONTEXT(ctx); \ __DRIdrawablePrivate *dPriv = smesa->driDrawable; \ + GLuint pitch = smesa->drawPitch; \ char *buf = (char *)(smesa->FbBase + smesa->drawOffset); \ char *read_buf = (char *)(smesa->FbBase + smesa->readOffset); \ GLuint p; \ @@ -61,57 +62,23 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #define HW_UNLOCK() do {} while(0); /* RGB565 */ -#define INIT_MONO_PIXEL(p, color) \ - p = SISPACKCOLOR565( color[0], color[1], color[2] ) +#define SPANTMP_PIXEL_FMT GL_RGB +#define SPANTMP_PIXEL_TYPE GL_UNSIGNED_SHORT_5_6_5 -#define WRITE_RGBA( _x, _y, r, g, b, a ) \ - *(GLushort *)(buf + _x*2 + _y*smesa->drawPitch) = \ - (((r & 0xf8) << 8) | \ - ((g & 0xfc) << 3) | \ - (b >> 3)) - -#define WRITE_PIXEL( _x, _y, p ) \ - *(GLushort *)(buf + _x*2 + _y*smesa->drawPitch) = p - -#define READ_RGBA( rgba, _x, _y ) \ -do { \ - GLushort p = *(GLushort *)(read_buf + _x*2 + _y*smesa->readPitch); \ - rgba[0] = (p & 0xf800) >> 8; \ - rgba[1] = (p & 0x07e0) >> 3; \ - rgba[2] = (p & 0x001f) << 3; \ - rgba[3] = 0xff; \ -} while(0) - -#define TAG(x) sis##x##_565 -#include "spantmp.h" +#define TAG(x) sis##x##_RGB565 +#define TAG2(x,y) sis##x##_RGB565##y +#include "spantmp2.h" /* ARGB8888 */ -#undef INIT_MONO_PIXEL -#define INIT_MONO_PIXEL(p, color) \ - p = SISPACKCOLOR8888( color[0], color[1], color[2], color[3] ) - -#define WRITE_RGBA( _x, _y, r, g, b, a ) \ - *(GLuint *)(buf + _x*4 + _y*smesa->drawPitch) = \ - (((a) << 24) | \ - ((r) << 16) | \ - ((g) << 8) | \ - ((b))) - -#define WRITE_PIXEL( _x, _y, p ) \ - *(GLuint *)(buf + _x*4 + _y*smesa->drawPitch) = p +/* FIXME the old code always read back alpha as 0xff, i.e. fully opaque. + Was there a reason to do so ? If so that'll won't work with that template... */ +#define SPANTMP_PIXEL_FMT GL_BGRA +#define SPANTMP_PIXEL_TYPE GL_UNSIGNED_INT_8_8_8_8_REV -#define READ_RGBA( rgba, _x, _y ) \ -do { \ - GLuint p = *(GLuint *)(read_buf + _x*4 + _y*smesa->readPitch); \ - rgba[0] = (p >> 16) & 0xff; \ - rgba[1] = (p >> 8) & 0xff; \ - rgba[2] = (p >> 0) & 0xff; \ - rgba[3] = 0xff; \ -} while(0) - -#define TAG(x) sis##x##_8888 -#include "spantmp.h" +#define TAG(x) sis##x##_ARGB8888 +#define TAG2(x,y) sis##x##_ARGB8888##y +#include "spantmp2.h" /* 16 bit depthbuffer functions. @@ -212,89 +179,9 @@ void sisSpanRenderFinish( GLcontext *ctx ) void sisDDInitSpanFuncs( GLcontext *ctx ) { - sisContextPtr smesa = SIS_CONTEXT(ctx); struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx); swdd->SetBuffer = sisDDSetBuffer; - - switch (smesa->zFormat) - { - case SiS_ZFORMAT_Z16: -#if 0 - swdd->ReadDepthSpan = sisReadDepthSpan_16; - swdd->ReadDepthPixels = sisReadDepthPixels_16; - swdd->WriteDepthSpan = sisWriteDepthSpan_16; - swdd->WriteDepthPixels = sisWriteDepthPixels_16; - - swdd->ReadStencilSpan = NULL; - swdd->ReadStencilPixels = NULL; - swdd->WriteStencilSpan = NULL; - swdd->WriteStencilPixels = NULL; -#endif - break; - case SiS_ZFORMAT_Z32: -#if 0 - swdd->ReadDepthSpan = sisReadDepthSpan_32; - swdd->ReadDepthPixels = sisReadDepthPixels_32; - swdd->WriteDepthSpan = sisWriteDepthSpan_32; - swdd->WriteDepthPixels = sisWriteDepthPixels_32; - - swdd->ReadStencilSpan = NULL; - swdd->ReadStencilPixels = NULL; - swdd->WriteStencilSpan = NULL; - swdd->WriteStencilPixels = NULL; -#endif - break; - case SiS_ZFORMAT_S8Z24: -#if 0 - swdd->ReadDepthSpan = sisReadDepthSpan_24_8; - swdd->ReadDepthPixels = sisReadDepthPixels_24_8; - swdd->WriteDepthSpan = sisWriteDepthSpan_24_8; - swdd->WriteDepthPixels = sisWriteDepthPixels_24_8; - - swdd->ReadStencilSpan = sisReadStencilSpan_24_8; - swdd->ReadStencilPixels = sisReadStencilPixels_24_8; - swdd->WriteStencilSpan = sisWriteStencilSpan_24_8; - swdd->WriteStencilPixels = sisWriteStencilPixels_24_8; -#endif - break; - } - -#if 0 - switch ( smesa->bytesPerPixel ) - { - case 2: - swdd->WriteRGBASpan = sisWriteRGBASpan_565; - swdd->WriteRGBSpan = sisWriteRGBSpan_565; - swdd->WriteMonoRGBASpan = sisWriteMonoRGBASpan_565; - swdd->WriteRGBAPixels = sisWriteRGBAPixels_565; - swdd->WriteMonoRGBAPixels = sisWriteMonoRGBAPixels_565; - swdd->ReadRGBASpan = sisReadRGBASpan_565; - swdd->ReadRGBAPixels = sisReadRGBAPixels_565; - break; - case 4: - swdd->WriteRGBASpan = sisWriteRGBASpan_8888; - swdd->WriteRGBSpan = sisWriteRGBSpan_8888; - swdd->WriteMonoRGBASpan = sisWriteMonoRGBASpan_8888; - swdd->WriteRGBAPixels = sisWriteRGBAPixels_8888; - swdd->WriteMonoRGBAPixels = sisWriteMonoRGBAPixels_8888; - swdd->ReadRGBASpan = sisReadRGBASpan_8888; - swdd->ReadRGBAPixels = sisReadRGBAPixels_8888; - break; - default: - sis_fatal_error("Bad bytesPerPixel.\n"); - break; - } - - swdd->WriteCI8Span = NULL; - swdd->WriteCI32Span = NULL; - swdd->WriteMonoCISpan = NULL; - swdd->WriteCI32Pixels = NULL; - swdd->WriteMonoCIPixels = NULL; - swdd->ReadCI32Span = NULL; - swdd->ReadCI32Pixels = NULL; -#endif - swdd->SpanRenderStart = sisSpanRenderStart; swdd->SpanRenderFinish = sisSpanRenderFinish; } @@ -309,22 +196,10 @@ sisSetSpanFunctions(driRenderbuffer *drb, const GLvisual *vis) { if (drb->Base.InternalFormat == GL_RGBA) { if (vis->redBits == 5 && vis->greenBits == 6 && vis->blueBits == 5) { - drb->Base.GetRow = sisReadRGBASpan_565; - drb->Base.GetValues = sisReadRGBAPixels_565; - drb->Base.PutRow = sisWriteRGBASpan_565; - drb->Base.PutRowRGB = sisWriteRGBSpan_565; - drb->Base.PutMonoRow = sisWriteMonoRGBASpan_565; - drb->Base.PutValues = sisWriteRGBAPixels_565; - drb->Base.PutMonoValues = sisWriteMonoRGBAPixels_565; + sisInitPointers_RGB565( &drb->Base ); } else { - drb->Base.GetRow = sisReadRGBASpan_8888; - drb->Base.GetValues = sisReadRGBAPixels_8888; - drb->Base.PutRow = sisWriteRGBASpan_8888; - drb->Base.PutRowRGB = sisWriteRGBSpan_8888; - drb->Base.PutMonoRow = sisWriteMonoRGBASpan_8888; - drb->Base.PutValues = sisWriteRGBAPixels_8888; - drb->Base.PutMonoValues = sisWriteMonoRGBAPixels_8888; + sisInitPointers_ARGB8888( &drb->Base ); } } else if (drb->Base.InternalFormat == GL_DEPTH_COMPONENT16) { -- 2.30.2