From 36fb83e4a868e047521b3d5e0edc4d7a77a96aaf Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Tue, 24 Jan 2012 14:35:34 +0100 Subject: st/mesa: Fix recurring surfaceless contexts A current incomplete framebuffer was incorrectly used as a st_framebuffer. When accessing st_framebuffer childs bad things happen: e.g. st_framebuffer::iface was used to check whether its an incomplete fb, instead we need to compare st_framebuffer::Base against mesa_get_incomplete_framebuffer. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44919 Note: This is a candidate for the 8.0 branch. Reviewed-by: Brian Paul --- src/mesa/state_tracker/st_manager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 63920a39ea..7efc17305e 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -688,7 +688,9 @@ st_framebuffer_reuse_or_create(struct gl_framebuffer *fb, { struct st_framebuffer *cur = st_ws_framebuffer(fb), *stfb = NULL; - if (cur && cur->iface == stfbi) { + /* dummy framebuffers cant be used as st_framebuffer */ + if (cur && &cur->Base != _mesa_get_incomplete_framebuffer() && + cur->iface == stfbi) { /* reuse the current stfb */ st_framebuffer_reference(&stfb, cur); } @@ -779,7 +781,7 @@ st_manager_flush_frontbuffer(struct st_context *st) return; /* never a dummy fb */ - assert(stfb->iface); + assert(&stfb->Base != _mesa_get_incomplete_framebuffer()); stfb->iface->flush_front(stfb->iface, ST_ATTACHMENT_FRONT_LEFT); } -- cgit v1.2.3