summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-06-30 22:19:41 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-06-30 22:19:41 +0000
commit595fce04f6e3477a898d6634e51653d809fcb35b (patch)
tree67eadb576f71dfb13858ae61a69955b664a0e8af
parent6c50e16b3dfde581e23791f97697470e8f45d23d (diff)
added histogram sink test
-rw-r--r--src/mesa/main/drawpix.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 46a1c7d3764..e24327d0939 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -1,4 +1,4 @@
-/* $Id: drawpix.c,v 1.25 2000/06/30 22:09:47 brianp Exp $ */
+/* $Id: drawpix.c,v 1.26 2000/06/30 22:19:41 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -654,7 +654,8 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
pixels, width, height, format, type, 0, row, 0);
_mesa_unpack_ubyte_color_span(ctx, width, GL_RGBA, (void*) rgba,
format, type, source, unpack, GL_TRUE);
- if (ctx->Pixel.MinMaxEnabled && ctx->MinMax.Sink)
+ if ((ctx->Pixel.MinMaxEnabled && ctx->MinMax.Sink) ||
+ (ctx->Pixel.HistogramEnabled && ctx->Histogram.Sink))
continue;
if (ctx->Texture.ReallyEnabled && ctx->Pixel.PixelTextureEnabled) {