From 89cda7bdc85b10526987321214965f21b148735f Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 17 Aug 2007 10:50:06 +0100 Subject: [PATCH] replace assertion w/ conditionals in xmesa_clear() --- src/mesa/drivers/x11/xm_surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/x11/xm_surface.c b/src/mesa/drivers/x11/xm_surface.c index a751b0868cf..d40d9eda84f 100644 --- a/src/mesa/drivers/x11/xm_surface.c +++ b/src/mesa/drivers/x11/xm_surface.c @@ -293,13 +293,13 @@ void xmesa_clear(struct pipe_context *pipe, struct pipe_surface *ps, GLuint value) { struct xmesa_renderbuffer *xrb = xmesa_rb((struct softpipe_surface *) ps); - assert(xrb); - if (xrb->ximage) { + + if (xrb && xrb->ximage) { /* clearing back color buffer */ GET_CURRENT_CONTEXT(ctx); xmesa_clear_buffers(ctx, BUFFER_BIT_BACK_LEFT); } - else if (xrb->pixmap) { + else if (xrb && xrb->pixmap) { /* clearing front color buffer */ GET_CURRENT_CONTEXT(ctx); xmesa_clear_buffers(ctx, BUFFER_BIT_FRONT_LEFT); -- 2.30.2