On Tue, 26 May 2015 23:58:29 +0100 Ben Avison <[email protected]> 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), > > > /*****************************************************************************/ > > diff --git a/pixman/pixman-mmx.c b/pixman/pixman-mmx.c > index 877b6e9..05c48a4 100644 > --- a/pixman/pixman-mmx.c > +++ b/pixman/pixman-mmx.c > @@ -4103,10 +4103,6 @@ static const pixman_fast_path_t mmx_fast_paths[] = > SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8b8g8r8, a8b8g8r8, > mmx_8888_n_8888 ), > SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8r8g8b8, x8r8g8b8, > mmx_8888_n_8888 ), > SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8b8g8r8, x8b8g8r8, > mmx_8888_n_8888 ), > - SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NORMAL (OVER, a8r8g8b8, a8r8g8b8, > mmx_8888_n_8888 ), > - SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NORMAL (OVER, a8b8g8r8, a8b8g8r8, > mmx_8888_n_8888 ), > - SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NORMAL (OVER, a8r8g8b8, x8r8g8b8, > mmx_8888_n_8888 ), > - SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NORMAL (OVER, a8b8g8r8, x8b8g8r8, > mmx_8888_n_8888 ), > > SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, a8r8g8b8, > mmx_8888_8888 ), > SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, > mmx_8888_8888 ), > diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c > index 1a8c430..8955103 100644 > --- a/pixman/pixman-sse2.c > +++ b/pixman/pixman-sse2.c > @@ -6283,10 +6283,6 @@ static const pixman_fast_path_t sse2_fast_paths[] = > SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8b8g8r8, a8b8g8r8, > sse2_8888_n_8888), > SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8r8g8b8, x8r8g8b8, > sse2_8888_n_8888), > SIMPLE_NEAREST_SOLID_MASK_FAST_PATH (OVER, a8b8g8r8, x8b8g8r8, > sse2_8888_n_8888), > - SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NORMAL (OVER, a8r8g8b8, a8r8g8b8, > sse2_8888_n_8888), > - SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NORMAL (OVER, a8b8g8r8, a8b8g8r8, > sse2_8888_n_8888), > - SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NORMAL (OVER, a8r8g8b8, x8r8g8b8, > sse2_8888_n_8888), > - SIMPLE_NEAREST_SOLID_MASK_FAST_PATH_NORMAL (OVER, a8b8g8r8, x8b8g8r8, > sse2_8888_n_8888), > > SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, a8r8g8b8, sse2_8888_8888), > SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, sse2_8888_8888), The same question as the previous patch: this changes the row ordering somewhat, is that ok? If the order is ok, then: Reviewed-by: Pekka Paalanen <[email protected]> Thanks, pq _______________________________________________ Pixman mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pixman
