Mesa (master): mesa: fix format/type check in unpack_image() for bitmaps
Brian Paul
brianp at kemper.freedesktop.org
Mon Sep 19 17:40:27 UTC 2011
Module: Mesa
Branch: master
Commit: 2ce8c3553b5f7b97b110ff7d968411027c156552
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ce8c3553b5f7b97b110ff7d968411027c156552
Author: Brian Paul <brianp at vmware.com>
Date: Mon Sep 19 11:38:02 2011 -0600
mesa: fix format/type check in unpack_image() for bitmaps
Passing type == GL_BITMAP returns 0 while error values return -1.
This fixes glPolygonStipple being compiled into display lists.
---
src/mesa/main/dlist.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 2b2ff90..e8f8fe2 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -887,7 +887,7 @@ unpack_image(struct gl_context *ctx, GLuint dimensions,
return NULL;
}
- if (_mesa_bytes_per_pixel(format, type) <= 0) {
+ if (_mesa_bytes_per_pixel(format, type) < 0) {
/* bad format and/or type */
return NULL;
}
More information about the mesa-commit
mailing list