Use the faster span read/write template for 16bpp

[mesa.git] / src / mesa / drivers / svga / svgamesa32.c

diff --git a/src/mesa/drivers/svga/svgamesa32.c b/src/mesa/drivers/svga/svgamesa32.c
index a67188f65c6016ea886b03b4a036c36aa5edd05c..8a366998d6bb3567ac359d26d5c7254360a02281 100644 (file)
--- a/src/mesa/drivers/svga/svgamesa32.c
+++ b/src/mesa/drivers/svga/svgamesa32.c
@@ -1,9 +1,9 @@
-/* $Id: svgamesa32.c,v 1.3 2000/01/23 17:49:54 brianp Exp $ */
+/* $Id: svgamesa32.c,v 1.12 2002/11/11 18:42:42 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.2
- * Copyright (C) 1995-2000  Brian Paul
+ * Version:  5.0
+ * Copyright (C) 1995-2002  Brian Paul
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -27,14 +27,20 @@
  * Additional authors:  Slawomir Szczyrba <steev@hot.pl>  (Mesa 3.2)
  */
 
+#ifdef HAVE_CONFIG_H
+#include "conf.h"
+#endif
+
 #ifdef SVGA
 
 #include "svgapix.h"
+#include "svgamesa32.h"
+#include "swrast/swrast.h"
 
-GLint * intBuffer;
 
 #if 0
-inline int RGB2BGR32(int c)
+/* this doesn't compile with GCC on RedHat 6.1 */
+static inline int RGB2BGR32(int c)
 {
        asm("rorw  $8, %0\n"     
            "rorl $16, %0\n"     
@@ -44,67 +50,81 @@ inline int RGB2BGR32(int c)
     return c;
 }
 #else
-int RGB2BGR32(int c)
+static unsigned long RGB2BGR32(unsigned long color)
 {
-   /* XXX this isn't right */
-   return c;
+   return (color & 0xff00)|(color>>16)|((color & 0xff)<<16);
 }
 #endif
 
-int __svga_drawpixel32(int x, int y, unsigned long c)
+static void __svga_drawpixel32(int x, int y, unsigned long c)
 {
     unsigned long offset;
 
-    intBuffer=(void *)SVGABuffer.BackBuffer;
+    GLint *intBuffer=(void *)SVGABuffer.DrawBuffer;
     y = SVGAInfo->height-y-1;
     offset = y * SVGAInfo->width + x;
     intBuffer[offset]=c;
-    return 0;
 }
 
-unsigned long __svga_getpixel32(int x, int y)
+static unsigned long __svga_getpixel32(int x, int y)
 {
     unsigned long offset;
 
-    intBuffer=(void *)SVGABuffer.BackBuffer;
+    const GLint *intBuffer=(void *)SVGABuffer.ReadBuffer;
     y = SVGAInfo->height-y-1;
     offset = y * SVGAInfo->width + x;
     return intBuffer[offset];
 }
 
-void __set_color32( GLcontext *ctx,
-                    GLubyte red, GLubyte green,
-                    GLubyte blue, GLubyte alpha )
-{
-   SVGAMesa->red = red;
-   SVGAMesa->green = green;
-   SVGAMesa->blue = blue;
-   SVGAMesa->truecolor = red<<16 | green<<8 | blue;
-}
-
-void __clear_color32( GLcontext *ctx,
-                      GLubyte red, GLubyte green,
-                      GLubyte blue, GLubyte alpha )
+void __clear_color32( GLcontext *ctx, const GLfloat color[4] )
 {
-   SVGAMesa->clear_truecolor = red<<16 | green<<8 | blue;
+   GLubyte col[3];
+   CLAMPED_FLOAT_TO_UBYTE(col[0], color[0]);
+   CLAMPED_FLOAT_TO_UBYTE(col[1], color[1]);
+   CLAMPED_FLOAT_TO_UBYTE(col[2], color[2]);
+   SVGAMesa->clear_truecolor = (col[0] << 16) | (col[1] << 8) | col[2];
 }
 
-GLbitfield __clear32( GLcontext *ctx, GLbitfield mask, GLboolean all,
-                        GLint x, GLint y, GLint width, GLint height )
+void __clear32( GLcontext *ctx, GLbitfield mask, GLboolean all,
+                GLint x, GLint y, GLint width, GLint height )
 {
    int i,j;
    
-   if (mask & GL_COLOR_BUFFER_BIT) {
-    if (all) {
-     intBuffer=(void *)SVGABuffer.BackBuffer;
-     for (i=0;i<SVGABuffer.BufferSize / 4;i++) intBuffer[i]=SVGAMesa->clear_truecolor;
-    } else {
-    for (i=x;i<width;i++)    
-     for (j=y;j<height;j++)    
-      __svga_drawpixel32(i,j,SVGAMesa->clear_truecolor);
-    }  
+   if (mask & DD_FRONT_LEFT_BIT) {
+      if (all) {
+         GLint *intBuffer=(void *)SVGABuffer.FrontBuffer;
+         for (i=0;i<SVGABuffer.BufferSize / 4;i++)
+            intBuffer[i]=SVGAMesa->clear_truecolor;
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.FrontBuffer;
+         for (i=x;i<width;i++)    
+            for (j=y;j<height;j++)    
+               __svga_drawpixel32(i,j,SVGAMesa->clear_truecolor);
+         SVGABuffer.DrawBuffer = tmp;
+      }
+      mask &= ~DD_FRONT_LEFT_BIT;
+   }
+   if (mask & DD_BACK_LEFT_BIT) {
+      if (all) {
+         GLint *intBuffer=(void *)SVGABuffer.BackBuffer;
+         for (i=0;i<SVGABuffer.BufferSize / 4;i++)
+            intBuffer[i]=SVGAMesa->clear_truecolor;
+      }
+      else {
+         GLubyte *tmp = SVGABuffer.DrawBuffer;
+         SVGABuffer.DrawBuffer = SVGABuffer.BackBuffer;
+         for (i=x;i<width;i++)    
+            for (j=y;j<height;j++)    
+               __svga_drawpixel32(i,j,SVGAMesa->clear_truecolor);
+         SVGABuffer.DrawBuffer = tmp;
+      }
+      mask &= ~DD_BACK_LEFT_BIT;
    }
-   return mask & (~GL_COLOR_BUFFER_BIT);
+
+   if (mask)
+      _swrast_Clear( ctx, mask, all, x, y, width, height );
 }
 
 void __write_rgba_span32( const GLcontext *ctx, GLuint n, GLint x, GLint y,
@@ -129,12 +149,13 @@ void __write_rgba_span32( const GLcontext *ctx, GLuint n, GLint x, GLint y,
 
 void __write_mono_rgba_span32( const GLcontext *ctx,
                                GLuint n, GLint x, GLint y,
-                               const GLubyte mask[])
+                               const GLchan color[4], const GLubyte mask[])
 {
    int i;
+   GLuint truecolor = color[RCOMP]<<16 | color[GCOMP]<<8 | color[BCOMP];
    for (i=0; i<n; i++, x++) {
       if (mask[i]) {
-         __svga_drawpixel32( x, y, SVGAMesa->truecolor);
+         __svga_drawpixel32( x, y, truecolor);
       }
    }
 }
@@ -163,13 +184,13 @@ void __write_rgba_pixels32( const GLcontext *ctx,
 void __write_mono_rgba_pixels32( const GLcontext *ctx,
                                  GLuint n,
                                  const GLint x[], const GLint y[],
-                                 const GLubyte mask[] )
+                                 const GLchan color[4], const GLubyte mask[] )
 {
+   GLuint truecolor = color[RCOMP]<<16 | color[GCOMP]<<8 | color[BCOMP];
    int i;
-   /* use current rgb color */
    for (i=0; i<n; i++) {
       if (mask[i]) {
-         __svga_drawpixel32( x[i], y[i], SVGAMesa->truecolor );
+         __svga_drawpixel32( x[i], y[i], truecolor );
       }
    }
 }
@@ -184,5 +205,16 @@ void __read_rgba_pixels32( const GLcontext *ctx,
    }
 }
 
+
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_svga32_dummy_function(void);
+void _mesa_svga32_dummy_function(void)
+{
+}
+
+
 #endif