projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1178ed8
)
fixed an assertion
author
Brian Paul
<brian.paul@tungstengraphics.com>
Wed, 13 Jun 2001 14:55:25 +0000
(14:55 +0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Wed, 13 Jun 2001 14:55:25 +0000
(14:55 +0000)
src/mesa/main/image.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/image.c
b/src/mesa/main/image.c
index df7a89d005f26158071012d482b1bc422613358b..376234285b0d4b1314840d8cccf5490072b092a1 100644
(file)
--- a/
src/mesa/main/image.c
+++ b/
src/mesa/main/image.c
@@
-1,4
+1,4
@@
-/* $Id: image.c,v 1.6
1 2001/05/16 20:27:12
brianp Exp $ */
+/* $Id: image.c,v 1.6
2 2001/06/13 14:55:25
brianp Exp $ */
/*
* Mesa 3-D graphics library
@@
-1720,7
+1720,7
@@
_mesa_pack_rgba_span( GLcontext *ctx,
const struct gl_pixelstore_attrib *dstPacking,
GLuint transferOps)
{
- ASSERT((ctx->NewState & _NEW_PIXEL) == 0);
+ ASSERT((ctx->NewState & _NEW_PIXEL) == 0
|| transferOps == 0
);
/* Test for optimized case first */
if (transferOps == 0 && dstFormat == GL_RGBA && dstType == CHAN_TYPE) {