Mesa (master): st/mesa: remove an incorrect assertion

Nicolai Hähnle nh at kemper.freedesktop.org
Thu May 18 09:47:57 UTC 2017


Module: Mesa
Branch: master
Commit: 377877ff5f5d08a1a417e8baf923b44c74f0d7e7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=377877ff5f5d08a1a417e8baf923b44c74f0d7e7

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Wed May 17 15:14:35 2017 +0200

st/mesa: remove an incorrect assertion

There is really no reason why the current DrawBuffer needs to be complete
at this point. In particular, the assertion gets hit on the X server side
in libglx when running .../piglit/bin/glx-get-current-display-ext -auto
(which uses indirect GLX rendering).

Fixes: 19b61799e3d0 ("st/mesa: don't cast the incomplete framebufer to st_framebuffer")
Reported-by: Michel Dänzer <michel.daenzer at amd.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/state_tracker/st_manager.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c
index 3178e25a76..cc781f4620 100644
--- a/src/mesa/state_tracker/st_manager.c
+++ b/src/mesa/state_tracker/st_manager.c
@@ -837,8 +837,6 @@ st_manager_flush_frontbuffer(struct st_context *st)
    struct st_framebuffer *stfb = st_ws_framebuffer(st->ctx->DrawBuffer);
    struct st_renderbuffer *strb = NULL;
 
-   assert(st->ctx->DrawBuffer != _mesa_get_incomplete_framebuffer());
-
    if (stfb)
       strb = st_renderbuffer(stfb->Base.Attachment[BUFFER_FRONT_LEFT].Renderbuffer);
    if (!strb)




More information about the mesa-commit mailing list