[Pixman] Going to land (Re: [PATCH] mmx/sse2: Use SIMPLE_NEAREST_SOLID_MASK_FAST_PATH for NORMAL repeat)

[Pekka Paalanen]

On Tue, 26 May 2015 23:58:29 +0100
Ben Avison <bavison at riscosopen.org> wrote:

> These two architectures were the only place where
> SIMPLE_NEAREST_SOLID_MASK_FAST_PATH was used, and in both cases the
> equivalent SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NORMAL macro was used
> immediately afterwards, so including the NORMAL case in the main macro
> simplifies the fast path table.
> ---
>  pixman/pixman-inlines.h |    3 ++-
>  pixman/pixman-mmx.c     |    4 ----
>  pixman/pixman-sse2.c    |    4 ----
>  3 files changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/pixman/pixman-inlines.h b/pixman/pixman-inlines.h
> index dd1c2f1..76338f3 100644
> --- a/pixman/pixman-inlines.h
> +++ b/pixman/pixman-inlines.h
> @@ -747,7 +747,8 @@ fast_composite_scaled_nearest  ## scale_func_name (pixman_implementation_t *imp,
>  #define SIMPLE_NEAREST_SOLID_MASK_FAST_PATH(op,s,d,func)		\
>      SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_COVER (op,s,d,func),		\
>      SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NONE (op,s,d,func),		\
> -    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_PAD (op,s,d,func)
> +    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_PAD (op,s,d,func),              \
> +    SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NORMAL (op,s,d,func),

There is an extra comma added at the end here. I removed it locally,
and things build again. Also distcheck passes on x86_64.

I have made a branch with my R-b's and amended commit messages at:
https://git.collabora.com/cgit/user/pq/pixman.git/log/?h=macro-cleanup

I'll push it early next week, if no-one objects.

I haven't reviewed the cover-test patch yet.


Thanks,
pq