[PATCH 1/8] glamor: Convert to using libepoxy.
Keith Packard
keithp at keithp.com
Wed Feb 5 15:49:38 PST 2014
Eric Anholt <eric at anholt.net> writes:
> + glamor_get_dispatch(glamor_priv);
> +
> box = REGION_RECTS(®ion);
> nbox = REGION_NUM_RECTS(®ion);
> 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 <keithp at keithp.com>
--
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140205/06cde50f/attachment-0001.pgp>
More information about the xorg-devel
mailing list