Module: Mesa Branch: master Commit: efbd33aff93d875af95d40db018b7911a3f87d02 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=efbd33aff93d875af95d40db018b7911a3f87d02
Author: Brian Paul <bri...@vmware.com> Date: Mon Jan 3 13:57:13 2011 -0700 st/mesa: fix renderbuffer pointer check in st_Clear() Fixes http://bugs.freedesktop.org/show_bug.cgi?id=30694 NOTE: This is a candidate for the 7.9 and 7.10 branches. --- src/mesa/state_tracker/st_cb_clear.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c index bd1dd78..6571bf2 100644 --- a/src/mesa/state_tracker/st_cb_clear.c +++ b/src/mesa/state_tracker/st_cb_clear.c @@ -470,13 +470,9 @@ st_Clear(struct gl_context *ctx, GLbitfield mask) if (mask & (1 << b)) { struct gl_renderbuffer *rb = ctx->DrawBuffer->Attachment[b].Renderbuffer; - struct st_renderbuffer *strb; + struct st_renderbuffer *strb = st_renderbuffer(rb); - assert(rb); - - strb = st_renderbuffer(rb); - - if (!strb->surface) + if (!strb || !strb->surface) continue; if (check_clear_color_with_quad( ctx, rb )) _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit