From: Brian <brian.paul@tungstengraphics.com>
Date: Fri, 17 Aug 2007 09:50:06 +0000 (+0100)
Subject: replace assertion w/ conditionals in xmesa_clear()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=89cda7bdc85b10526987321214965f21b148735f;p=mesa.git

replace assertion w/ conditionals in xmesa_clear()
---

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);