diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-30 16:32:42 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-10-30 16:32:42 +0000 |
| commit | 9499e017b7e05411a32b3e4fa94885eaec0d7277 (patch) | |
| tree | 5fcb3ec3bc037e24e652aeebb8c37f97aab7becf /src/mesa/main/image.c | |
| parent | caef4a35d602669f742524757bef3c63f0c164a8 (diff) | |
Removed UPDATE_IMAGE_TRANSFER_STATE, use _NEW_PIXEL flag instead.
More minor GLchan changes.
Silence some compiler warnings in cva.[ch]
Diffstat (limited to 'src/mesa/main/image.c')
| -rw-r--r-- | src/mesa/main/image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index 4cbf677072..1711a75eab 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -1,4 +1,4 @@ -/* $Id: image.c,v 1.45 2000/10/29 18:12:15 brianp Exp $ */ +/* $Id: image.c,v 1.46 2000/10/30 16:32:43 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1700,7 +1700,7 @@ _mesa_pack_rgba_span( GLcontext *ctx, const struct gl_pixelstore_attrib *dstPacking, GLuint transferOps) { - ASSERT(ctx->ImageTransferState != UPDATE_IMAGE_TRANSFER_STATE); + ASSERT((ctx->NewState & _NEW_PIXEL) == 0); /* Test for optimized case first */ if (transferOps == 0 && dstFormat == GL_RGBA && dstType == CHAN_TYPE) { |