more GL_EXT_convolution work

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 17d9cde..bab5e95 100644 (file)
--- 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 23c5b77..dc6abb3 100644 (file)
--- 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 27ca7db..1526491 100644 (file)
--- 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