summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/svga/svgamesa16.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2001-02-06 00:03:47 +0000
committerBrian Paul <[email protected]>2001-02-06 00:03:47 +0000
commit8fd9f1748d12751683cf8039401a7f7f66ab73fa (patch)
treecafe046dcf6a79e4682ea334246bde0fbc1f5105 /src/mesa/drivers/svga/svgamesa16.c
parent228748bc494b391d2444f96789591803e72779e6 (diff)
misc updates to match latest device driver changes
Diffstat (limited to 'src/mesa/drivers/svga/svgamesa16.c')
-rw-r--r--src/mesa/drivers/svga/svgamesa16.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/mesa/drivers/svga/svgamesa16.c b/src/mesa/drivers/svga/svgamesa16.c
index 20d1ed6fecb..ed36beca244 100644
--- a/src/mesa/drivers/svga/svgamesa16.c
+++ b/src/mesa/drivers/svga/svgamesa16.c
@@ -1,4 +1,4 @@
-/* $Id: svgamesa16.c,v 1.8 2001/01/24 00:04:59 brianp Exp $ */
+/* $Id: svgamesa16.c,v 1.9 2001/02/06 00:03:48 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -35,6 +35,7 @@
#include "svgapix.h"
#include "svgamesa16.h"
+#include "swrast/swrast.h"
static void __svga_drawpixel16(int x, int y, unsigned long c)
@@ -64,8 +65,8 @@ void __clear_color16( GLcontext *ctx, const GLchan color[4] )
/* 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, GLboolean all,
+ GLint x, GLint y, GLint width, GLint height )
{
int i,j;
@@ -83,7 +84,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;
@@ -98,8 +100,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, all, x, y, width, height );
}
void __write_rgba_span16( const GLcontext *ctx, GLuint n, GLint x, GLint y,