Re: [PATCH 1/8] glamor: Convert to using libepoxy.

Wed, 05 Feb 2014 15:50:45 -0800 

Eric Anholt <[email protected]> writes:


> +    glamor_get_dispatch(glamor_priv);
> +
>      box = REGION_RECTS(&region);
>      nbox = REGION_NUM_RECTS(&region);
>      pbox = box;
> @@ -833,8 +831,6 @@ _glamor_trapezoids_with_shader(CARD8 op,
>      glamor_priv->has_mask_coords = (key.mask != SHADER_MASK_NONE &&
>                                      key.mask != SHADER_MASK_SOLID);
>  
> -    dispatch = glamor_get_dispatch(glamor_priv);
> -


> +    glUseProgram(0);
> +    glamor_put_dispatch(glamor_priv);
>  
>   TRAPEZOID_OUT:
>      if (box) {
> @@ -1002,10 +999,6 @@ _glamor_trapezoids_with_shader(CARD8 op,
>          }
>      }
>  
> -    if (dispatch) {
> -        glamor_put_dispatch(glamor_priv);
> -    }
> -

Ok, this makes sense -- you needed to make sure glamor_get_dispatch was
always called before glamor_put_dispatch and you didn't have the
'dispatch' variable to make an easy check.

I also built and ran Xephyr with this code and it seemed to work, but I
didn't test it extensively.

Reviewed-by: Keith Packard <[email protected]>

-- 
[email protected]

Attachment: pgp5ziFF3jLF_.pgp
Description: PGP signature

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to