diff options
| author | Brian Paul <brianp@vmware.com> | 2011-01-03 13:57:13 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-01-03 14:01:41 -0700 |
| commit | efbd33aff93d875af95d40db018b7911a3f87d02 (patch) | |
| tree | 2e9af479a117c62d25b15fa85c03706d7983a151 | |
| parent | 65da73c5f87bc39c76ba9e45945da95fff354308 (diff) | |
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.
| -rw-r--r-- | 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 bd1dd78b23..6571bf237f 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 )) |