fast: Swap image and iter flags in generated fast paths
authorSøren Sandmann Pedersen <ssp@redhat.com>
Wed, 2 Oct 2013 21:51:36 +0000 (17:51 -0400)
committerSøren Sandmann Pedersen <ssp@redhat.com>
Fri, 4 Oct 2013 18:11:57 +0000 (14:11 -0400)
The generated fast paths that were moved into the 'fast'
implementation in ec0e38cbb746a673f8e989ab8eae356c8c77dac7 had their
image and iter flag arguments swapped; as a result, none of the fast
paths were ever called.

pixman/pixman-fast-path.c

index b06d1b27d4627f9195827fe878fbf9c7fc16a42a..c6e43de10acc8112f6e26c78df761fb270ee4cd8 100644 (file)
@@ -3236,22 +3236,22 @@ static const pixman_iter_info_t fast_iters[] =
     
 #define SEPARABLE_CONVOLUTION_AFFINE_FAST_PATH(name, format, repeat)   \
     { PIXMAN_ ## format,                                               \
-      ITER_NARROW | ITER_SRC,                                          \
       GENERAL_SEPARABLE_CONVOLUTION_FLAGS | FAST_PATH_ ## repeat ## _REPEAT, \
+      ITER_NARROW | ITER_SRC,                                          \
       NULL, bits_image_fetch_separable_convolution_affine_ ## name, NULL \
     },
 
 #define BILINEAR_AFFINE_FAST_PATH(name, format, repeat)                        \
     { PIXMAN_ ## format,                                               \
-      ITER_NARROW | ITER_SRC,                                          \
       GENERAL_BILINEAR_FLAGS | FAST_PATH_ ## repeat ## _REPEAT,                \
+      ITER_NARROW | ITER_SRC,                                          \
       NULL, bits_image_fetch_bilinear_affine_ ## name, NULL,           \
     },
 
 #define NEAREST_AFFINE_FAST_PATH(name, format, repeat)                 \
     { PIXMAN_ ## format,                                               \
-      ITER_NARROW | ITER_SRC,                                          \
       GENERAL_NEAREST_FLAGS | FAST_PATH_ ## repeat ## _REPEAT,         \
+      ITER_NARROW | ITER_SRC,                                          \
       NULL, bits_image_fetch_nearest_affine_ ## name, NULL             \
     },