Imported the Savage DRI driver from the savage-2-0-0-branch of DRI CVS

with modifications to make it work with current Mesa 6.

1 files changed, 313 insertions, 0 deletions

diff --git a/src/mesa/drivers/dri/savage/savagespan.c b/src/mesa/drivers/dri/savage/savagespan.c
new file mode 100644
index 00000000000..aa13cfcb1d1
--- /dev/null
+++ b/src/mesa/drivers/dri/savage/savagespan.c
@@ -0,0 +1,313 @@
+/*
+ * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * VIA, S3 GRAPHICS, AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "mtypes.h"
+#include "savagedd.h"
+#include "savagespan.h"
+#include "savageioctl.h"
+#include "savage_bci.h"
+#include "savage_3d_reg.h"
+#include "swrast/swrast.h"
+
+#define DBG 0
+
+#define LOCAL_VARS					\
+   __DRIdrawablePrivate *dPriv = imesa->mesa_drawable;	\
+   savageScreenPrivate *savageScreen = imesa->savageScreen;	\
+   GLuint cpp   = savageScreen->cpp;			\
+   GLuint pitch = imesa->aperturePitch;			\
+   GLuint height = dPriv->h;				\
+   char *buf = (char *)(imesa->drawMap +		\
+			dPriv->x * cpp +		\
+			dPriv->y * pitch);		\
+   char *read_buf = (char *)(imesa->readMap +		\
+			     dPriv->x * cpp +		\
+			     dPriv->y * pitch); 	\
+   GLuint p = SAVAGE_CONTEXT( ctx )->MonoColor;         \
+   (void) read_buf; (void) buf; (void) p
+
+#define LOCAL_DEPTH_VARS				\
+   __DRIdrawablePrivate *dPriv = imesa->mesa_drawable;	\
+   savageScreenPrivate *savageScreen = imesa->savageScreen;	\
+   GLuint zpp   = savageScreen->zpp;			\
+   GLuint pitch = imesa->aperturePitch;			\
+   GLuint height = dPriv->h;				\
+   char *buf = (char *)(imesa->apertureBase[TARGET_DEPTH] +	\
+			dPriv->x * zpp +			\
+			dPriv->y * pitch)
+
+#define LOCAL_STENCIL_VARS LOCAL_DEPTH_VARS
+
+#define INIT_MONO_PIXEL(p)
+
+#define CLIPPIXEL(_x,_y) (_x >= minx && _x < maxx && \
+			  _y >= miny && _y < maxy)
+
+
+#define CLIPSPAN( _x, _y, _n, _x1, _n1, _i )				\
+   if ( _y < miny || _y >= maxy ) {					\
+      _n1 = 0, _x1 = x;							\
+   } else {								\
+      _n1 = _n;								\
+      _x1 = _x;								\
+      if ( _x1 < minx ) _i += (minx-_x1), n1 -= (minx-_x1), _x1 = minx; \
+      if ( _x1 + _n1 >= maxx ) n1 -= (_x1 + n1 - maxx);		        \
+   }
+
+#define Y_FLIP(_y) (height - _y - 1)
+
+#define HW_LOCK() savageContextPtr imesa = SAVAGE_CONTEXT(ctx); \
+                  WAIT_IDLE_EMPTY;\
+
+#define HW_CLIPLOOP()						\
+  do {								\
+    __DRIdrawablePrivate *dPriv = imesa->driDrawable;		\
+    int _nc = dPriv->numClipRects;				\
+    while (_nc--) {						\
+       int minx = dPriv->pClipRects[_nc].x1 - dPriv->x;		\
+       int miny = dPriv->pClipRects[_nc].y1 - dPriv->y; 	\
+       int maxx = dPriv->pClipRects[_nc].x2 - dPriv->x;		\
+       int maxy = dPriv->pClipRects[_nc].y2 - dPriv->y;
+
+
+#define HW_ENDCLIPLOOP()			\
+    }						\
+  } while (0)
+
+#if 0
+#define HW_UNLOCK()				\
+    UNLOCK_HARDWARE(imesa);
+#endif
+#define HW_UNLOCK()	{ }
+
+
+/* 16 bit, 565 rgb color spanline and pixel functions
+ */
+#undef INIT_MONO_PIXEL
+#define INIT_MONO_PIXEL(p, color) \
+  p = SAVAGEPACKCOLOR565( color[0], color[1], color[2] )
+
+#define WRITE_RGBA( _x, _y, r, g, b, a )				\
+do{									\
+   *(GLushort *)(buf + (_x<<1) + _y*pitch)  = ( (((int)r & 0xf8) << 8) |\
+		                             (((int)g & 0xfc) << 3) |	\
+		                             (((int)b & 0xf8) >> 3));	\
+}while(0)
+#define WRITE_PIXEL( _x, _y, p )  \
+do{								\
+   *(GLushort *)(buf + (_x<<1) + _y*pitch) = p;			\
+}while(0)
+
+#define READ_RGBA( rgba, _x, _y )				\
+do {								\
+   GLushort p = *(GLushort *)(read_buf + (_x<<1) + _y*pitch);	\
+   rgba[0] = (((p >> 11) & 0x1f) * 255) >>5;			\
+   rgba[1] = (((p >>  5) & 0x3f) * 255) >>6;			\
+   rgba[2] = (((p >>  0) & 0x1f) * 255) >>5;			\
+   rgba[3] = 255;						\
+} while(0)
+
+#define TAG(x) savage##x##_565
+#include "spantmp.h"
+
+
+/* 32 bit, 8888 ARGB color spanline and pixel functions
+ */
+#undef INIT_MONO_PIXEL
+#define INIT_MONO_PIXEL(p, color) \
+  p = SAVAGEPACKCOLOR8888( color[0], color[1], color[2], color[3] )
+
+#define WRITE_RGBA( _x, _y, r, g, b, a )				\
+   *(GLuint *)(buf + (_x<<2) + _y*pitch)  = ( ((GLuint)a << 24) |	\
+		                            ((GLuint)r << 16) |	\
+		                            ((GLuint)g << 8) |	\
+		                            ((GLuint)b ))
+#define WRITE_PIXEL( _x, _y, p )  \
+   *(GLuint *)(buf + (_x<<2) + _y*pitch) = p
+
+#define READ_RGBA( rgba, _x, _y )				\
+do {								\
+   GLuint p = *(GLuint *)(read_buf + (_x<<2) + _y*pitch);	\
+   rgba[0] = (p >> 16) & 0xFF;			\
+   rgba[1] = (p >>  8) & 0xFF;			\
+   rgba[2] = (p >>  0) & 0xFF;			\
+   rgba[3] = 0xFF;				\
+} while(0)
+
+#define TAG(x) savage##x##_8888
+#include "spantmp.h"
+
+
+
+
+/* 16 bit depthbuffer functions.
+ */
+#define WRITE_DEPTH( _x, _y, d ) \
+do{							\
+    *(GLushort *)(buf + (_x<<1) + _y*pitch)  = d;	\
+}while(0)
+    
+#define READ_DEPTH( d, _x, _y ) \
+do{							\
+    d = *(GLushort *)(buf + (_x<<1) + _y*pitch);	\
+}while(0)
+       
+/*     d = 0xffff; */
+       
+#define TAG(x) savage##x##_16
+#include "depthtmp.h"
+       
+
+
+
+
+/* 8-bit stencil /24-bit depth depthbuffer functions.
+ */
+#define WRITE_DEPTH( _x, _y, d ) {			\
+   GLuint tmp = *(GLuint *)(buf + (_x<<2) + _y*pitch);	\
+   tmp &= 0xFF000000;					\
+   tmp |= d;						\
+   *(GLuint *)(buf + (_x<<2) + _y*pitch)  = tmp;		\
+}
+
+#define READ_DEPTH( d, _x, _y )	\
+   d = *(GLuint *)(buf + (_x<<2) + _y*pitch) & 0x00FFFFFF;
+
+/*     d = 0x00ffffff; */
+
+#define TAG(x) savage##x##_8_24
+#include "depthtmp.h"
+
+
+#define WRITE_STENCIL( _x, _y, d ) {                    \
+   GLuint tmp = *(GLuint *)(buf + (_x<<2) + _y*pitch);     \
+   tmp &= 0x00FFFFFF;                                   \
+   tmp |= (((GLuint)d)<<24) & 0xFF000000;               \
+   *(GLuint *)(buf + (_x<<2) + _y*pitch) = tmp;            \
+}
+            
+#define READ_STENCIL( d, _x, _y )               \
+   d = (GLstencil)((*(GLuint *)(buf + (_x<<2) + _y*pitch) & 0xFF000000) >> 24);
+                
+#define TAG(x) savage##x##_8_24
+#include "stenciltmp.h"
+                
+
+/*
+ * 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 savageDDSetBuffer(GLcontext *ctx, GLframebuffer *buffer,
+			      GLuint bufferBit)
+{
+   savageContextPtr imesa = SAVAGE_CONTEXT(ctx);
+   char *map;
+
+   assert( (bufferBit == FRONT_LEFT_BIT) || (bufferBit == BACK_LEFT_BIT) );
+
+   map = (bufferBit == FRONT_LEFT_BIT)
+       ? (char*)imesa->apertureBase[TARGET_FRONT]
+       : (char*)imesa->apertureBase[TARGET_BACK];
+
+   imesa->drawMap = map;
+   imesa->readMap = map;
+
+   assert( (buffer == imesa->driDrawable->driverPrivate)
+	   || (buffer == imesa->driReadable->driverPrivate) );
+
+   imesa->mesa_drawable = (buffer == imesa->driDrawable->driverPrivate)
+       ? imesa->driDrawable : imesa->driReadable;
+}
+
+
+void savageDDInitSpanFuncs( GLcontext *ctx )
+{
+   savageContextPtr imesa = SAVAGE_CONTEXT(ctx);
+   struct swrast_device_driver *swdd = _swrast_GetDeviceDriverReference(ctx);
+
+   swdd->SetBuffer = savageDDSetBuffer;
+   
+   switch (imesa->savageScreen->cpp) 
+   {
+   case 2:
+      swdd->WriteRGBASpan = savageWriteRGBASpan_565;
+      swdd->WriteRGBSpan = savageWriteRGBSpan_565;
+      swdd->WriteMonoRGBASpan = savageWriteMonoRGBASpan_565;
+      swdd->WriteRGBAPixels = savageWriteRGBAPixels_565;
+      swdd->WriteMonoRGBAPixels = savageWriteMonoRGBAPixels_565;
+      swdd->ReadRGBASpan = savageReadRGBASpan_565;
+      swdd->ReadRGBAPixels = savageReadRGBAPixels_565;
+   
+      break;
+
+   case 4:
+      swdd->WriteRGBASpan = savageWriteRGBASpan_8888;
+      swdd->WriteRGBSpan = savageWriteRGBSpan_8888;
+      swdd->WriteMonoRGBASpan = savageWriteMonoRGBASpan_8888;
+      swdd->WriteRGBAPixels = savageWriteRGBAPixels_8888;
+      swdd->WriteMonoRGBAPixels = savageWriteMonoRGBAPixels_8888;
+      swdd->ReadRGBASpan = savageReadRGBASpan_8888;
+      swdd->ReadRGBAPixels = savageReadRGBAPixels_8888;
+   }
+
+   switch (imesa->savageScreen->zpp)
+   {
+   case 2: 
+       swdd->ReadDepthSpan = savageReadDepthSpan_16;
+       swdd->WriteDepthSpan = savageWriteDepthSpan_16;
+       swdd->ReadDepthPixels = savageReadDepthPixels_16;
+       swdd->WriteDepthPixels = savageWriteDepthPixels_16;
+       
+       break;
+   case 4: 
+       swdd->ReadDepthSpan = savageReadDepthSpan_8_24;
+       swdd->WriteDepthSpan = savageWriteDepthSpan_8_24;
+       swdd->ReadDepthPixels = savageReadDepthPixels_8_24;
+       swdd->WriteDepthPixels = savageWriteDepthPixels_8_24;    
+#if HW_STENCIL
+       swdd->ReadStencilSpan = savageReadStencilSpan_8_24;
+       swdd->WriteStencilSpan = savageWriteStencilSpan_8_24;
+       swdd->ReadStencilPixels = savageReadStencilPixels_8_24;
+       swdd->WriteStencilPixels = savageWriteStencilPixels_8_24;
+#endif       
+       break;   
+   
+   }
+   swdd->WriteCI8Span        =NULL;
+   swdd->WriteCI32Span       =NULL;
+   swdd->WriteMonoCISpan     =NULL;
+   swdd->WriteCI32Pixels     =NULL;
+   swdd->WriteMonoCIPixels   =NULL;
+   swdd->ReadCI32Span        =NULL;
+   swdd->ReadCI32Pixels      =NULL;
+
+   /* Pixel path fallbacks.
+    */
+   ctx->Driver.Accum = _swrast_Accum;
+   ctx->Driver.Bitmap = _swrast_Bitmap;
+   ctx->Driver.CopyPixels = _swrast_CopyPixels;
+   ctx->Driver.DrawPixels = _swrast_DrawPixels;
+   ctx->Driver.ReadPixels = _swrast_ReadPixels;
+}