aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/swrast/s_copypix.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2001-02-20 16:42:25 +0000
committerBrian Paul <[email protected]>2001-02-20 16:42:25 +0000
commitc499ce31baf820e84d133c2189f88e15a1a36672 (patch)
tree5fa0cc1d10f0e54703c7a0ceb55fcb4aa81c74e3 /src/mesa/swrast/s_copypix.c
parent0c75c4c41754a4f66cdc124b4328e92635b473fe (diff)
Implemented GL_SGIX_shadow and GL_SGIX_shadow_texture.
Added some const keywords in the s/w texturing code.
Diffstat (limited to 'src/mesa/swrast/s_copypix.c')
-rw-r--r--src/mesa/swrast/s_copypix.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index 401955d00ae..4c4d0003178 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -1,4 +1,4 @@
-/* $Id: s_copypix.c,v 1.10 2001/01/23 23:39:37 brianp Exp $ */
+/* $Id: s_copypix.c,v 1.11 2001/02/20 16:42:26 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -248,7 +248,8 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
_mesa_pixeltexgen(ctx, width, (const GLchan (*)[4]) rgba,
s, t, r, q);
_swrast_texture_fragments(ctx, unit, width, s, t, r, NULL,
- primary_rgba, rgba);
+ (CONST GLchan (*)[4]) primary_rgba,
+ rgba);
}
}
@@ -494,7 +495,8 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
_mesa_pixeltexgen(ctx, width, (const GLchan (*)[4]) rgba,
s, t, r, q);
_swrast_texture_fragments(ctx, unit, width, s, t, r, NULL,
- primary_rgba, rgba);
+ (CONST GLchan (*)[4]) primary_rgba,
+ rgba);
}
}