-/* $Id: svgamesa32.c,v 1.5 2000/01/25 20:21:19 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
* 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"
+
#if 0
/* this doesn't compile with GCC on RedHat 6.1 */
-static inline int RGB2BGR32(int c)
+static INLINE int RGB2BGR32(int c)
{
asm("rorw $8, %0\n"
"rorl $16, %0\n"
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 )
{
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) {
__svga_drawpixel32(i,j,SVGAMesa->clear_truecolor);
SVGABuffer.DrawBuffer = tmp;
}
+ mask &= ~DD_FRONT_LEFT_BIT;
}
if (mask & DD_BACK_LEFT_BIT) {
if (all) {
__svga_drawpixel32(i,j,SVGAMesa->clear_truecolor);
SVGABuffer.DrawBuffer = tmp;
}
+ mask &= ~DD_BACK_LEFT_BIT;
}
- return mask & (~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT));
+
+ if (mask)
+ _swrast_Clear( ctx, mask );
}
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);
}
}
}
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 );
}
}
}
}
}
+
+#else
+
+
+/* silence compiler warning */
+extern void _mesa_svga32_dummy_function(void);
+void _mesa_svga32_dummy_function(void)
+{
+}
+
+
#endif