summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-04-28 07:21:25 -0600
committerBrian Paul <brianp@vmware.com>2010-04-28 07:21:25 -0600
commit1fa7789e828d1005e2473fc7cd364bd45eb30843 (patch)
tree5e3e1978e6cc511e90298622b7a04840a285782d /progs
parent37e98e5cd217075d58456753ed8450dc116fe32c (diff)
parenteecd2a59c1205246cc220ab09a79988838bb1759 (diff)
Merge branch '7.8'
Conflicts: src/glx/dri2_glx.c src/glx/glx_pbuffer.c
Diffstat (limited to 'progs')
-rw-r--r--progs/osdemos/Makefile2
-rw-r--r--progs/osdemos/ostest1.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/progs/osdemos/Makefile b/progs/osdemos/Makefile
index f53515cb0a..2a0f208083 100644
--- a/progs/osdemos/Makefile
+++ b/progs/osdemos/Makefile
@@ -5,7 +5,7 @@ include $(TOP)/configs/current
INCDIR = $(TOP)/include
-OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -l$(OSMESA_LIB) $(APP_LIB_DEPS)
+OSMESA_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(OSMESA_LIB) $(APP_LIB_DEPS)
OSMESA16_LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -lOSMesa16 -l$(GLU_LIB) \
-l$(GL_LIB) $(APP_LIB_DEPS)
diff --git a/progs/osdemos/ostest1.c b/progs/osdemos/ostest1.c
index 000b8c4a78..5a00fdb246 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);