summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorJouk Jansen <joukj@hrem.stm.tudelft.nl>2000-11-28 08:03:22 +0000
committerJouk Jansen <joukj@hrem.stm.tudelft.nl>2000-11-28 08:03:22 +0000
commitbfea97321ca4ae0ca65b560d7bd2bb30c7ca8a07 (patch)
tree71e991d236bac97aba83405b4323406a6df87040 /src/mesa
parent45015e4d79d63183f6d9c4e4fad655921e07b0ab (diff)
Committing in .
Modified Files: Mesa/src/swrast/s_copypix.c changed one occurence of rgba to rgbaFloat ----------------------------------------------------------------------
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_copypix.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index 96172e0271..1c5f58fcf0 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.5 2000/11/28 00:07:52 brianp Exp $ */
+/* $Id: s_copypix.c,v 1.6 2000/11/28 08:03:22 joukj Exp $ */
/*
* Mesa 3-D graphics library
@@ -439,7 +439,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
}
/* GL_POST_CONVOLUTION_RED/GREEN/BLUE/ALPHA_SCALE/BIAS */
if (transferOps & IMAGE_POST_CONVOLUTION_SCALE_BIAS) {
- _mesa_scale_and_bias_rgba(ctx, width, rgba,
+ _mesa_scale_and_bias_rgba(ctx, width, rgbaFloat,
ctx->Pixel.PostConvolutionScale[RCOMP],
ctx->Pixel.PostConvolutionScale[GCOMP],
ctx->Pixel.PostConvolutionScale[BCOMP],