summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-10-11 22:21:55 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-10-11 22:21:55 +0000
commit8a5871a98c23ce1a1d893b681f59dc8c42228dd1 (patch)
tree80adfa732d431f2e1adb5b89621503399c3da326
parent55fa6a2fdbc9108f2d435b70cefb58e77bba903a (diff)
use GLvoid * for _swrast_write_zoomed_rgb/rgba_span() functions
-rw-r--r--src/mesa/swrast/s_copypix.c8
-rw-r--r--src/mesa/swrast/s_drawpix.c15
-rw-r--r--src/mesa/swrast/s_zoom.c12
-rw-r--r--src/mesa/swrast/s_zoom.h6
4 files changed, 17 insertions, 24 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index 2654df3e486..be794e38e2a 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.5.1
+ * Version: 6.5.2
*
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
*
@@ -226,7 +226,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
span.end = width;
if (zoom) {
_swrast_write_zoomed_rgba_span(ctx, destx, desty, &span,
- (CONST GLchan (*)[4])span.array->rgba);
+ span.array->rgba);
}
else {
_swrast_write_rgba_span(ctx, &span);
@@ -362,7 +362,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
span.end = width;
if (zoom) {
_swrast_write_zoomed_rgba_span(ctx, destx, desty, &span,
- (CONST GLchan (*)[4]) span.array->rgba);
+ span.array->rgba);
}
else {
_swrast_write_rgba_span(ctx, &span);
@@ -605,7 +605,7 @@ copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
if (fb->Visual.rgbMode) {
if (zoom)
_swrast_write_zoomed_rgba_span(ctx, destx, desty, &span,
- (const GLchan (*)[4]) span.array->rgba);
+ span.array->rgba);
else
_swrast_write_rgba_span(ctx, &span);
}
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index 02db69a2a44..5be2934b409 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -130,8 +130,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
span.x = destX;
span.y = destY + row;
span.end = drawWidth;
- _swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span,
- (CONST GLchan (*)[4]) src);
+ _swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span, src);
src += unpack.RowLength * 4;
}
}
@@ -156,8 +155,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _swrast_write_zoomed_rgb_span(ctx, imgX, imgY, &span,
- (CONST GLchan (*)[3]) src);
+ _swrast_write_zoomed_rgb_span(ctx, imgX, imgY, &span, src);
src += unpack.RowLength * 3;
destY++;
}
@@ -200,8 +198,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _swrast_write_zoomed_rgb_span(ctx, imgX, imgY, &span,
- (CONST GLchan (*)[3]) rgb);
+ _swrast_write_zoomed_rgb_span(ctx, imgX, imgY, &span, rgb);
src += unpack.RowLength;
destY++;
}
@@ -247,7 +244,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
span.y = destY;
span.end = drawWidth;
_swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span,
- (CONST GLchan (*)[4]) span.array->rgba);
+ span.array->rgba);
src += unpack.RowLength*2;
destY++;
}
@@ -281,7 +278,7 @@ fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
span.y = destY;
span.end = drawWidth;
_swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span,
- (CONST GLchan (*)[4]) span.array->rgba);
+ span.array->rgba);
src += unpack.RowLength;
destY++;
}
@@ -677,7 +674,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
}
else if (zoom) {
_swrast_write_zoomed_rgba_span(ctx, imgX, imgY, &span,
- (CONST GLchan (*)[4]) span.array->rgba);
+ span.array->rgba);
}
else {
_swrast_write_rgba_span(ctx, &span);
diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c
index eb44c88b076..29b8df41b7e 100644
--- a/src/mesa/swrast/s_zoom.c
+++ b/src/mesa/swrast/s_zoom.c
@@ -343,20 +343,18 @@ zoom_span( GLcontext *ctx, GLint imgX, GLint imgY, const SWspan *span,
void
-_swrast_write_zoomed_rgba_span( GLcontext *ctx, GLint imgX, GLint imgY,
- const SWspan *span,
- CONST GLchan rgba[][4])
+_swrast_write_zoomed_rgba_span(GLcontext *ctx, GLint imgX, GLint imgY,
+ const SWspan *span, const GLvoid *rgba)
{
- zoom_span(ctx, imgX, imgY, span, (const GLvoid *) rgba, GL_RGBA);
+ zoom_span(ctx, imgX, imgY, span, rgba, GL_RGBA);
}
void
_swrast_write_zoomed_rgb_span(GLcontext *ctx, GLint imgX, GLint imgY,
- const SWspan *span,
- CONST GLchan rgb[][3])
+ const SWspan *span, const GLvoid *rgb)
{
- zoom_span(ctx, imgX, imgY, span, (const GLvoid *) rgb, GL_RGB);
+ zoom_span(ctx, imgX, imgY, span, rgb, GL_RGB);
}
diff --git a/src/mesa/swrast/s_zoom.h b/src/mesa/swrast/s_zoom.h
index a7750dcaa30..6ca11ac2111 100644
--- a/src/mesa/swrast/s_zoom.h
+++ b/src/mesa/swrast/s_zoom.h
@@ -31,13 +31,11 @@
extern void
_swrast_write_zoomed_rgba_span(GLcontext *ctx, GLint imgX, GLint imgY,
- const SWspan *span,
- CONST GLchan rgb[][4]);
+ const SWspan *span, const GLvoid *rgba);
extern void
_swrast_write_zoomed_rgb_span(GLcontext *ctx, GLint imgX, GLint imgY,
- const SWspan *span,
- CONST GLchan rgb[][3]);
+ const SWspan *span, const GLvoid *rgb);
extern void
_swrast_write_zoomed_index_span(GLcontext *ctx, GLint imgX, GLint imgY,