diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-05 15:58:09 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-05 15:58:09 -0700 |
| commit | 80a718a63bf2fa817e346f0f5731ee9ef2e0e68b (patch) | |
| tree | 4a1bdb03ae8b8482b9a15e56c9604fcc34e95b0e /src/mesa/state_tracker/st_framebuffer.c | |
| parent | 7115b79b77e541f3eb81db00f6f0c34a0f224feb (diff) | |
| parent | de14fdd63f26a2e6fc55fad92c08966f269601a6 (diff) | |
| download | external_mesa3d-80a718a63bf2fa817e346f0f5731ee9ef2e0e68b.zip external_mesa3d-80a718a63bf2fa817e346f0f5731ee9ef2e0e68b.tar.gz external_mesa3d-80a718a63bf2fa817e346f0f5731ee9ef2e0e68b.tar.bz2 | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/auxiliary/rtasm/rtasm_execmem.c
src/mesa/shader/slang/slang_emit.c
src/mesa/shader/slang/slang_log.c
src/mesa/state_tracker/st_atom_framebuffer.c
Diffstat (limited to 'src/mesa/state_tracker/st_framebuffer.c')
| -rw-r--r-- | src/mesa/state_tracker/st_framebuffer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_framebuffer.c b/src/mesa/state_tracker/st_framebuffer.c index fe9900d..6fd731d 100644 --- a/src/mesa/state_tracker/st_framebuffer.c +++ b/src/mesa/state_tracker/st_framebuffer.c @@ -291,7 +291,8 @@ st_notify_swapbuffers_complete(struct st_framebuffer *stfb) for (i = 0; i < BUFFER_COUNT; i++) { if (stfb->Base.Attachment[i].Renderbuffer) { strb = st_renderbuffer(stfb->Base.Attachment[i].Renderbuffer); - strb->surface->status = PIPE_SURFACE_STATUS_UNDEFINED; + if (strb->surface) + strb->surface->status = PIPE_SURFACE_STATUS_UNDEFINED; } } } |