Mesa (7.8): osdemos: replace assertion with error handler

Brian Paul brianp at kemper.freedesktop.org
Wed Apr 28 13:12:11 UTC 2010


Module: Mesa
Branch: 7.8
Commit: 29fc97606b13edb20fd1fc5351a066ba85968c77
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=29fc97606b13edb20fd1fc5351a066ba85968c77

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Apr 27 17:05:56 2010 -0600

osdemos: replace assertion with error handler

---

 progs/osdemos/ostest1.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/progs/osdemos/ostest1.c b/progs/osdemos/ostest1.c
index 000b8c4..5a00fdb 100644
--- a/progs/osdemos/ostest1.c
+++ b/progs/osdemos/ostest1.c
@@ -399,7 +399,11 @@ test(GLenum type, GLint bits, const char *filename)
 
    /* sanity checks */
    glGetIntegerv(GL_RED_BITS, &cBits);
-   assert(cBits == bits);
+   if (cBits != bits) {
+      fprintf(stderr, "Unable to create %d-bit/channel renderbuffer.\n", bits);
+      fprintf(stderr, "May need to recompile Mesa with CHAN_BITS=16 or 32.\n");
+      return 0;
+   }
    glGetIntegerv(GL_GREEN_BITS, &cBits);
    assert(cBits == bits);
    glGetIntegerv(GL_BLUE_BITS, &cBits);




More information about the mesa-commit mailing list