[Mesa-dev] [PATCH] st/mesa: remove an incorrect assertion

Marek Olšák maraeo at gmail.com
Wed May 17 16:06:35 UTC 2017


Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Wed, May 17, 2017 at 3:18 PM, Nicolai Hähnle <nhaehnle at gmail.com> wrote:
> From: Nicolai Hähnle <nicolai.haehnle at amd.com>
>
> There is really no reason why the current DrawBuffer needs to be complete
> at this point. In particularly, 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>
> ---
>  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 3178e25..cc781f4 100644
> --- a/src/mesa/state_tracker/st_manager.c
> +++ b/src/mesa/state_tracker/st_manager.c
> @@ -830,22 +830,20 @@ st_api_destroy(struct st_api *stapi)
>
>  /**
>   * Flush the front buffer if the current context renders to the front buffer.
>   */
>  void
>  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)
>        return;
>
>     /* never a dummy fb */
>     stfb->iface->flush_front(&st->iface, stfb->iface, ST_ATTACHMENT_FRONT_LEFT);
>  }
>
>  /**
> --
> 2.9.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list