aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2001-04-20 19:21:41 +0000
committerBrian Paul <[email protected]>2001-04-20 19:21:41 +0000
commitb570a180dada9e54ff55905ff11ea882ad8cb57d (patch)
tree86b6699b3a931da3636b6c3c644f8f9f96f67780 /src/mesa/swrast
parent0a31a672692c7e5f821f6c2f737b0b15f97bf2d9 (diff)
Minor fixes for Win32 (Karl Schultz).
Diffstat (limited to 'src/mesa/swrast')
-rw-r--r--src/mesa/swrast/s_accum.c3
-rw-r--r--src/mesa/swrast/s_drawpix.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_accum.c b/src/mesa/swrast/s_accum.c
index f338886c9c7..7a10b4b4b98 100644
--- a/src/mesa/swrast/s_accum.c
+++ b/src/mesa/swrast/s_accum.c
@@ -1,4 +1,4 @@
-/* $Id: s_accum.c,v 1.10 2001/04/10 15:25:45 brianp Exp $ */
+/* $Id: s_accum.c,v 1.11 2001/04/20 19:21:41 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -25,6 +25,7 @@
*/
+#include "glheader.h"
#include "context.h"
#include "macros.h"
#include "mmath.h"
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index 8432fe32758..ea4fef7d53a 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: s_drawpix.c,v 1.16 2001/04/10 15:25:45 brianp Exp $ */
+/* $Id: s_drawpix.c,v 1.17 2001/04/20 19:21:41 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -833,11 +833,11 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
if (quickDraw) {
(*swrast->Driver.WriteRGBASpan)( ctx, width, x, y,
- (CONST GLchan (*)[]) rgba, NULL);
+ (CONST GLchan (*)[4]) rgba, NULL);
}
else if (zoom) {
_mesa_write_zoomed_rgba_span( ctx, width, x, y, zspan, 0,
- (CONST GLchan (*)[]) rgba, desty );
+ (CONST GLchan (*)[4]) rgba, desty );
}
else {
_mesa_write_rgba_span( ctx, (GLuint) width, x, y, zspan, 0,