[Glamor] [PATCH] glamor: Revert a context related change. It caused a compilation error since context switcher related changes have not been pulled into this tree. This reverts commit 73ab7f4.

[Alex Deucher]

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>


On Tue, Mar 18, 2014 at 12:28 PM, Samuel Li <samuel.li at amd.com> wrote:
> ---
>  src/glamor.c |    8 +-------
>  1 files changed, 1 insertions(+), 7 deletions(-)
>
> diff --git a/src/glamor.c b/src/glamor.c
> index eb9c0ee..52e2f21 100644
> --- a/src/glamor.c
> +++ b/src/glamor.c
> @@ -225,8 +225,6 @@ glamor_block_handler(ScreenPtr screen)
>             glamor_get_screen_private(screen);
>         glamor_gl_dispatch *dispatch;
>
> -       assert(!glamor_priv->ctx.get_count);
> -
>         dispatch = glamor_get_dispatch(glamor_priv);
>         glamor_priv->tick++;
>         dispatch->glFlush();
> @@ -244,11 +242,7 @@ _glamor_block_handler(void *data, OSTimePtr timeout,
>                       void *last_select_mask)
>  {
>         glamor_screen_private *glamor_priv = data;
> -       glamor_gl_dispatch *dispatch;
> -
> -       assert(!glamor_priv->ctx.get_count);
> -
> -       dispatch = glamor_get_dispatch(glamor_priv);
> +       glamor_gl_dispatch *dispatch = glamor_get_dispatch(glamor_priv);
>         dispatch->glFlush();
>         glamor_put_dispatch(glamor_priv);
>  }
> --
> 1.7.5.4
>
>
> _______________________________________________
> Glamor mailing list
> Glamor at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/glamor