diff options
| author | Brian Paul <brianp@vmware.com> | 2011-01-04 08:00:25 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-01-04 08:00:25 -0700 |
| commit | 54c2846f2300a18569287929bb72b4803716edf1 (patch) | |
| tree | 741fa5a310f762583cff555da62aa87eb66c3cda | |
| parent | 894145001076509dcdd1524c45c57fc2b8cefee8 (diff) | |
| download | mesa-54c2846f2300a18569287929bb72b4803716edf1.tar.gz | |
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.
(cherry picked from commit efbd33aff93d875af95d40db018b7911a3f87d02)
| -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 246ab2e9579..00489c60d96 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(GLcontext *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 )) |