projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use GLuint instead of uint
[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 3332503d2b8d131223cc42d5a963e4f6cc51a439..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.
7 2000/11/14 17:40:14
brianp Exp $ */
+/* $Id: svgamesa15.c,v 1.
11 2002/11/11 18:42:39
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version:
3.3
- * Copyright (C) 1995-200
0
Brian Paul
+ * Version:
5.0
+ * Copyright (C) 1995-200
2
Brian Paul
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
*
* 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 "svgapix.h"
#include "svgamesa15.h"
+#include "swrast/swrast.h"
+
static void __svga_drawpixel15(int x, int y, unsigned long c)
{
static void __svga_drawpixel15(int x, int y, unsigned long c)
{
@@
-54,16
+56,18
@@
static unsigned long __svga_getpixel15(int x, int y)
return shortBuffer[offset];
}
return shortBuffer[offset];
}
-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);*/
}
/* SVGAMesa->clear_hicolor=(red)<<10 | (green)<<5 | (blue);*/
}
-
GLbitfiel
d __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all,
-
GLint x, GLint y, GLint width, GLint height )
+
voi
d __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all,
+ GLint x, GLint y, GLint width, GLint height )
{
int i, j;
{
int i, j;
@@
-81,6
+85,7
@@
GLbitfield __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all,
__svga_drawpixel15(i,j,SVGAMesa->clear_hicolor);
SVGABuffer.DrawBuffer = tmp;
}
__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;
}
if (mask & DD_BACK_LEFT_BIT) {
GLshort *shortBuffer=(void *)SVGABuffer.BackBuffer;
@@
-96,8
+101,11
@@
GLbitfield __clear15( GLcontext *ctx, GLbitfield mask, GLboolean all,
__svga_drawpixel15(i,j,SVGAMesa->clear_hicolor);
SVGABuffer.DrawBuffer = tmp;
}
__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,
}
void __write_rgba_span15( const GLcontext *ctx, GLuint n, GLint x, GLint y,