Make R128 driver use sarea/defines from DRM. removed r128_common.h

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

diff --git a/src/mesa/drivers/svga/svgamesa15.c b/src/mesa/drivers/svga/svgamesa15.c
index cb73a8567949637b28acac1db81b2e8b9ea709e1..54b6c977a7baca8da4ddb828280e3c0ea94be06d 100644 (file)
--- a/src/mesa/drivers/svga/svgamesa15.c
+++ b/src/mesa/drivers/svga/svgamesa15.c
@@ -1,9 +1,9 @@
-/* $Id: svgamesa15.c,v 1.5 2000/01/31 22:10:06 tanner Exp $ */
+/* $Id: svgamesa15.c,v 1.11 2002/11/11 18:42:39 brianp 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 +35,8 @@
 
 #include "svgapix.h"
 #include "svgamesa15.h"
+#include "swrast/swrast.h"
+
 
 static void __svga_drawpixel15(int x, int y, unsigned long c)
 {
@@ -54,24 +56,18 @@ static unsigned long __svga_getpixel15(int x, int y)
     return shortBuffer[offset];
 }
 
-void __set_color15( GLcontext *ctx,
-                    GLubyte red, GLubyte green,
-                    GLubyte blue, GLubyte alpha )
-{
-   SVGAMesa->hicolor=(red>>3)<<10 | (green>>3)<<5 | (blue>>3); 
-/*   SVGAMesa->hicolor=(red)<<10 | (green)<<5 | (blue); */
-}   
-
-void __clear_color15( GLcontext *ctx,
-                      GLubyte red, GLubyte green,
-                      GLubyte blue, GLubyte alpha )
+void __clear_color15( GLcontext *ctx, const GLfloat color[4] )
 {
-   SVGAMesa->clear_hicolor=(red>>3)<<10 | (green>>3)<<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)<<10 | (col[1]>>3)<<5 | (col[2]>>3);  
 /*   SVGAMesa->clear_hicolor=(red)<<10 | (green)<<5 | (blue);*/
 }   
 
-GLbitfield __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all,
-                      GLint x, GLint y, GLint width, GLint height )
+void __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all,
+                GLint x, GLint y, GLint width, GLint height )
 {
    int i, j;
 
@@ -89,6 +85,7 @@ GLbitfield __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all,
                __svga_drawpixel15(i,j,SVGAMesa->clear_hicolor);
          SVGABuffer.DrawBuffer = tmp;
       }
+      mask &= ~DD_FRONT_LEFT_BIT;
    }
    if (mask & DD_BACK_LEFT_BIT) {
       GLshort *shortBuffer=(void *)SVGABuffer.BackBuffer;
@@ -104,8 +101,11 @@ GLbitfield __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all,
                __svga_drawpixel15(i,j,SVGAMesa->clear_hicolor);
          SVGABuffer.DrawBuffer = tmp;
       }
+      mask &= ~DD_BACK_LEFT_BIT;
    }
-   return mask & (~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT));
+
+   if (mask)
+      _swrast_Clear( ctx, mask, all, x, y, width, height );
 }
 
 void __write_rgba_span15( const GLcontext *ctx, GLuint n, GLint x, GLint y,
@@ -134,12 +134,15 @@ void __write_rgba_span15( const GLcontext *ctx, GLuint n, GLint x, GLint y,
 
 void __write_mono_rgba_span15( const GLcontext *ctx,
                                GLuint n, GLint x, GLint y,
-                               const GLubyte mask[])
+                               const GLchan color[4], const GLubyte mask[])
 {
+   GLushort hicolor = (color[RCOMP] >> 3) << 10 |
+                      (color[GCOMP] >> 3) << 5 |
+                      (color[BCOMP] >> 3); 
    int i;
    for (i=0; i<n; i++, x++) {
       if (mask[i]) {
-         __svga_drawpixel15( x, y, SVGAMesa->hicolor);
+         __svga_drawpixel15( x, y, hicolor);
       }
    }
 }
@@ -174,13 +177,16 @@ void __write_rgba_pixels15( const GLcontext *ctx,
 void __write_mono_rgba_pixels15( 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) << 10 |
+                      (color[GCOMP] >> 3) << 5 |
+                      (color[BCOMP] >> 3); 
    int i;
    /* use current rgb color */
    for (i=0; i<n; i++) {
       if (mask[i]) {
-         __svga_drawpixel15( x[i], y[i], SVGAMesa->hicolor );
+         __svga_drawpixel15( x[i], y[i], hicolor );
       }
    }
 }
@@ -198,4 +204,14 @@ void __read_rgba_pixels15( const GLcontext *ctx,
    }
 }
 
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_svga15_dummy_function(void);
+void _mesa_svga15_dummy_function(void)
+{
+}
+
+
 #endif