diff options
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/osdemos/Makefile | 2 | ||||
| -rw-r--r-- | progs/osdemos/ostest1.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/progs/osdemos/Makefile b/progs/osdemos/Makefile index f53515cb0a7..2a0f2080832 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 000b8c4a781..5a00fdb246e 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); |