[PATCH 03/13] glamor: Use glamor_program for glamor_push_pixels

Eric Anholt eric at anholt.net
Tue May 6 10:46:52 PDT 2014


Keith Packard <keithp at keithp.com> writes:

> This uses the same shaders as glamor_poly_glyph_blt.
>
> Signed-off-by: Keith Packard <keithp at keithp.com>
> ---
>  glamor/glamor_glyphblt.c | 131 ++++++++++++++++++-----------------------------
>  1 file changed, 49 insertions(+), 82 deletions(-)
>
> diff --git a/glamor/glamor_glyphblt.c b/glamor/glamor_glyphblt.c
> index 1c511ff..8ed3a14 100644
> --- a/glamor/glamor_glyphblt.c
> +++ b/glamor/glamor_glyphblt.c

> -static Bool
> -_glamor_push_pixels(GCPtr pGC, PixmapPtr pBitmap,
> -                    DrawablePtr pDrawable, int w, int h, int x, int y,
> -                    Bool fallback)
> -{
> -    glamor_pixmap_private *pixmap_priv;
> -
> -    if (!fallback && glamor_ddx_fallback_check_pixmap(pDrawable)
> -        && glamor_ddx_fallback_check_pixmap(&pBitmap->drawable)
> -        && glamor_ddx_fallback_check_gc(pGC))
> -        return FALSE;
> +    glamor_pixmap_loop(pixmap_priv, box_x, box_y) {
> +        glamor_set_destination_drawable(drawable, box_x, box_y, FALSE, TRUE, prog->matrix_uniform, NULL, NULL);

glamor is mostly wrapped at 80 columns, and I think consistently
wrapping here would look better than not.

Other than that, I'd reviewed the previous version of this patch that
I'd seen in your branch, and I don't think you've changed it.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140506/b79daf74/attachment.sig>


More information about the xorg-devel mailing list