summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-05-10 14:39:53 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-05-10 14:39:53 +0000
commit7a39d2f833807f8defd2304b0ff180944c23ea0c (patch)
tree4c27a842446472a571671246cb3fce9d9cca614d /src/mesa
parent102860a4590b64b74af25880e06483da938a2b88 (diff)
more GL_EXT_convolution work
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/main/colortab.c5
-rw-r--r--src/mesa/main/image.c6
-rw-r--r--src/mesa/main/image.h4
3 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 17d9cdee61..bab5e959d5 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -1,4 +1,4 @@
-/* $Id: colortab.c,v 1.16 2000/04/18 14:32:10 brianp Exp $ */
+/* $Id: colortab.c,v 1.17 2000/05/10 14:39:53 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -451,7 +451,8 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
GLfloat *dest = (GLfloat *) table->Table + start * comps * sizeof(GLfloat);
ASSERT(table->TableType == GL_FLOAT);
_mesa_unpack_float_color_span(ctx, count, table->Format, dest,
- format, type, data, &ctx->Unpack, GL_TRUE);
+ format, type, data, &ctx->Unpack,
+ GL_FALSE, GL_TRUE);
}
if (texObj || target == GL_SHARED_TEXTURE_PALETTE_EXT) {
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 23c5b776d8..dc6abb39d7 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.30 2000/05/04 13:48:49 brianp Exp $ */
+/* $Id: image.c,v 1.31 2000/05/10 14:39:53 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -2459,7 +2459,7 @@ _mesa_unpack_float_color_span( GLcontext *ctx,
GLenum srcFormat, GLenum srcType,
const GLvoid *source,
const struct gl_pixelstore_attrib *unpacking,
- GLboolean applyTransferOps )
+ GLboolean applyTransferOps, GLboolean clamp )
{
ASSERT(dstFormat == GL_ALPHA ||
dstFormat == GL_LUMINANCE ||
@@ -2601,7 +2601,7 @@ _mesa_unpack_float_color_span( GLcontext *ctx,
}
/* clamp to [0,1] */
- {
+ if (clamp) {
GLuint i;
for (i = 0; i < n; i++) {
rgba[i][RCOMP] = CLAMP(rgba[i][RCOMP], 0.0F, 1.0F);
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h
index 27ca7dbe93..1526491b81 100644
--- a/src/mesa/main/image.h
+++ b/src/mesa/main/image.h
@@ -1,4 +1,4 @@
-/* $Id: image.h,v 1.8 2000/04/18 14:32:10 brianp Exp $ */
+/* $Id: image.h,v 1.9 2000/05/10 14:39:53 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -102,7 +102,7 @@ _mesa_unpack_float_color_span( GLcontext *ctx,
GLenum srcFormat, GLenum srcType,
const GLvoid *source,
const struct gl_pixelstore_attrib *unpacking,
- GLboolean applyTransferOps );
+ GLboolean applyTransferOps, GLboolean clamp );
extern void