gallium/draw: initial code to properly support llvm in the draw module

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

diff --git a/src/mesa/drivers/svga/svgamesa16.c b/src/mesa/drivers/svga/svgamesa16.c
index 6057d7d732049159f0c4ba32c26a96f5a9092e71..9fc8c786e8d9da408872d1cee98687d6ffd383fb 100644 (file)
--- a/src/mesa/drivers/svga/svgamesa16.c
+++ b/src/mesa/drivers/svga/svgamesa16.c
@@ -1,9 +1,8 @@
-/* $Id: svgamesa16.c,v 1.5 2000/01/31 22:10:06 tanner Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.3
- * 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
@@ -35,6 +34,7 @@
 
 #include "svgapix.h"
 #include "svgamesa16.h"
+#include "swrast/swrast.h"
 
 
 static void __svga_drawpixel16(int x, int y, unsigned long c)
@@ -56,26 +56,26 @@ static unsigned long __svga_getpixel16(int x, int y)
     return shortBuffer[offset];
 }
 
-void __set_color16( GLcontext *ctx,
-                    GLubyte red, GLubyte green,
-                    GLubyte blue, GLubyte alpha )
+void __clear_color16( GLcontext *ctx, const GLfloat color[4] )
 {
-    SVGAMesa->hicolor=(red>>3)<<11 | (green>>2)<<5 | (blue>>3); 
-/*    SVGAMesa->hicolor=(red)<<11 | (green)<<5 | (blue); */
-}   
-
-void __clear_color16( GLcontext *ctx,
-                      GLubyte red, GLubyte green,
-                      GLubyte blue, GLubyte alpha )
-{
-    SVGAMesa->clear_hicolor=(red>>3)<<11 | (green>>2)<<5 | (blue>>3); 
+   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_hicolor = (col[0] >> 3) << 11 |
+                              (col[1] >> 2) << 5 |
+                              (col[2] >> 3); 
 /*    SVGAMesa->clear_hicolor=(red)<<11 | (green)<<5 | (blue); */
 }   
 
-GLbitfield __clear16( GLcontext *ctx, GLbitfield mask, GLboolean all,
-                      GLint x, GLint y, GLint width, GLint height )
+void __clear16( GLcontext *ctx, GLbitfield mask )
 {
    int i,j;
+   int x = ctx->DrawBuffer->_Xmin;
+   int y = ctx->DrawBuffer->_Ymin;
+   int width = ctx->DrawBuffer->_Xmax - x;
+   int height = ctx->DrawBuffer->_Ymax - y;
+   GLboolean all = (width == ctx->DrawBuffer->Width && height == ctx->DrawBuffer->height)
 
    if (mask & DD_FRONT_LEFT_BIT) {
       if (all) {
@@ -91,7 +91,8 @@ GLbitfield __clear16( GLcontext *ctx, GLbitfield mask, GLboolean all,
                __svga_drawpixel16(i,j,SVGAMesa->clear_hicolor);
          SVGABuffer.DrawBuffer = tmp;
       }
-   }    
+      mask &= ~DD_FRONT_LEFT_BIT;
+   }
    if (mask & DD_BACK_LEFT_BIT) {
       if (all) {
          GLshort *shortBuffer=(void *)SVGABuffer.BackBuffer;
@@ -106,8 +107,11 @@ GLbitfield __clear16( GLcontext *ctx, GLbitfield mask, GLboolean all,
                __svga_drawpixel16(i,j,SVGAMesa->clear_hicolor);
          SVGABuffer.DrawBuffer = tmp;
       }
-   }    
-   return mask & (~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT));
+      mask &= ~DD_BACK_LEFT_BIT;
+   }
+
+   if (mask)
+      _swrast_Clear( ctx, mask );
 }
 
 void __write_rgba_span16( const GLcontext *ctx, GLuint n, GLint x, GLint y,
@@ -136,12 +140,13 @@ void __write_rgba_span16( const GLcontext *ctx, GLuint n, GLint x, GLint y,
 
 void __write_mono_rgba_span16( const GLcontext *ctx,
                                GLuint n, GLint x, GLint y,
-                               const GLubyte mask[])
+                               const GLchan color[4], const GLubyte mask[])
 {
+   GLushort hicolor=(color[RCOMP]>>3)<<11 | (color[GCOMP]>>2)<<5 | (color[BCOMP]>>3); 
    int i;
    for (i=0; i<n; i++, x++) {
       if (mask[i]) {
-         __svga_drawpixel16( x, y, SVGAMesa->hicolor);
+         __svga_drawpixel16( x, y, hicolor);
       }
    }
 }
@@ -176,13 +181,13 @@ void __write_rgba_pixels16( const GLcontext *ctx,
 void __write_mono_rgba_pixels16( const GLcontext *ctx,
                                  GLuint n,
                                  const GLint x[], const GLint y[],
-                                 const GLubyte mask[] )
+                                 const GLchan color[4], const GLubyte mask[] )
 {
+   GLushort hicolor=(color[RCOMP]>>3)<<11 | (color[GCOMP]>>2)<<5 | (color[BCOMP]>>3); 
    int i;
-   /* use current rgb color */
    for (i=0; i<n; i++) {
       if (mask[i]) {
-         __svga_drawpixel16( x[i], y[i], SVGAMesa->hicolor );
+         __svga_drawpixel16( x[i], y[i], hicolor );
       }
    }
 }
@@ -200,4 +205,14 @@ void __read_rgba_pixels16( const GLcontext *ctx,
    }
 }
 
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_svga16_dummy_function(void);
+void _mesa_svga16_dummy_function(void)
+{
+}
+
+
 #endif