raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=259f33679c38e03de3e35c3a0859b3f3f0f9c39a
commit 259f33679c38e03de3e35c3a0859b3f3f0f9c39a
Author: Albin Tonnerre <albin.tonne...@gmail.com>
Date: Sun Feb 9 09:42:52 2014 +0900
evas/op_blend: rename LOOP_ALIGNED_U1_A48_SSE3 to LOOP_ALIGNED_U1_A48
Summary:
There's nothing SSE3-specific about that macro, let's use a more generic
name
for it. Since that's just a generic macro, we can also allow non-SSE (eg.
NEON) code to use it if they want to
Reviewers: cedric
CC: cedric
Differential Revision: https://phab.enlightenment.org/D528
---
src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c | 4 ++--
.../evas/common/evas_op_blend/op_blend_mask_color_sse3.c | 6 +++---
.../evas/common/evas_op_blend/op_blend_pixel_color_sse3.c | 14 +++++++-------
.../evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c | 6 +++---
src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c | 8 ++++----
src/lib/evas/include/evas_blend_ops.h | 9 ++++-----
6 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c
b/src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c
index 02321b5..e986f10 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_color_sse3.c
@@ -10,7 +10,7 @@ _op_blend_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m
EINA_UNUSED, DATA32 c, DATA3
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
const __m128i a_packed = _mm_set_epi32(a, a, a, a);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
*d = c + MUL_256(a, *d);
@@ -94,7 +94,7 @@ _op_blend_rel_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m
EINA_UNUSED, DATA32 c, D
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
const __m128i alpha_packed = _mm_set_epi32(alpha, alpha, alpha, alpha);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
*d = MUL_SYM(*d >> 24, c) + MUL_256(alpha, *d);
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c
b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c
index 429e8d5..576220d 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_mask_color_sse3.c
@@ -7,7 +7,7 @@ _op_blend_mas_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m, DATA32
c, DATA32 *d, in
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
DATA32 a = *m;
@@ -76,7 +76,7 @@ _op_blend_mas_can_dp_sse3(DATA32 *s EINA_UNUSED, DATA8 *m,
DATA32 c, DATA32 *d,
const __m128i one = _mm_set_epi32(1, 1, 1, 1);
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
alpha = *m;
@@ -215,7 +215,7 @@ _op_blend_rel_mas_c_dp_sse3(DATA32 *s EINA_UNUSED, DATA8
*m, DATA32 c, DATA32 *d
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
DATA32 mc = MUL_SYM(*m, c);
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c
b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c
index b0c2b84..c97fd2e 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_color_sse3.c
@@ -9,7 +9,7 @@ _op_blend_p_c_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32
c, DATA32 *d, int
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
DATA32 sc = MUL4_SYM(c, *s);
@@ -69,7 +69,7 @@ _op_blend_pan_c_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED,
DATA32 c, DATA32 *d, in
const __m128i c_alpha = _mm_set_epi32(c_a, c_a, c_a, c_a);
const __m128i a0 = _mm_set_epi32(alpha, alpha, alpha, alpha);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
*d = ((c & 0xff000000) + MUL3_SYM(c, *s)) + MUL_256(alpha, *d);
@@ -119,7 +119,7 @@ _op_blend_p_can_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED,
DATA32 c, DATA32 *d, in
int alpha;
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
alpha = 256 - (*s >> 24);
@@ -173,7 +173,7 @@ _op_blend_pan_can_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED,
DATA32 c, DATA32 *d,
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
*d++ = 0xff000000 + MUL3_SYM(c, *s);
@@ -215,7 +215,7 @@ _op_blend_p_caa_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED,
DATA32 c, DATA32 *d, in
c = 1 + (c & 0xff);
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
DATA32 sc = MUL_256(c, *s);
@@ -268,7 +268,7 @@ _op_blend_pan_caa_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED,
DATA32 c, DATA32 *d,
c = 1 + (c & 0xff);
const __m128i c_packed = _mm_set_epi32(c, c, c,c);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
*d = INTERP_256(c, *s, *d);
@@ -397,7 +397,7 @@ _op_blend_rel_p_c_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED,
DATA32 c, DATA32 *d,
const __m128i c_packed = _mm_set_epi32(c, c, c, c);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
DATA32 sc = MUL4_SYM(c, *s);
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c
b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c
index e33831f..07f336b 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_mask_sse3.c
@@ -7,7 +7,7 @@ _op_blend_p_mas_dp_sse3(DATA32 *s, DATA8 *m, DATA32 c, DATA32
*d, int l) {
int alpha;
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
alpha = *m;
@@ -67,7 +67,7 @@ _op_blend_pas_mas_dp_sse3(DATA32 *s, DATA8 *m, DATA32 c
EINA_UNUSED, DATA32 *d,
const __m128i ones = _mm_set_epi32(1, 1, 1, 1);
int alpha;
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
alpha = *m;
@@ -199,7 +199,7 @@ _op_blend_rel_p_mas_dp_sse3(DATA32 *s, DATA8 *m, DATA32 c,
DATA32 *d, int l) {
int alpha;
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
c = MUL_SYM(*m, *s);
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c
b/src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c
index 2601853..76ef880 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_pixel_sse3.c
@@ -5,7 +5,7 @@
static void
_op_blend_p_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32 c EINA_UNUSED,
DATA32 *d, int l) {
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
int alpha = 256 - (*s >> 24);
@@ -56,7 +56,7 @@ _op_blend_pas_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED, DATA32
c EINA_UNUSED, DAT
const __m128i zero = _mm_setzero_si128();
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
switch (*s & 0xff000000)
{
@@ -182,7 +182,7 @@ _op_blend_rel_p_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED,
DATA32 c, DATA32 *d, in
const __m128i ones = _mm_set_epi32(1, 1, 1, 1);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
int alpha = 256 - (*s >> 24);
@@ -233,7 +233,7 @@ _op_blend_rel_pan_dp_sse3(DATA32 *s, DATA8 *m EINA_UNUSED,
DATA32 c, DATA32 *d,
const __m128i ones = _mm_set_epi32(1, 1, 1, 1);
- LOOP_ALIGNED_U1_A48_SSE3(d, l,
+ LOOP_ALIGNED_U1_A48(d, l,
{ /* UOP */
c = 1 + (*d >> 24);
diff --git a/src/lib/evas/include/evas_blend_ops.h
b/src/lib/evas/include/evas_blend_ops.h
index 3ae9437..560236d 100644
--- a/src/lib/evas/include/evas_blend_ops.h
+++ b/src/lib/evas/include/evas_blend_ops.h
@@ -406,7 +406,10 @@ mul3_sym_sse3(__m128i x, __m128i y) {
return _mm_and_si128(res, RGB_MASK_SSE3);
}
-#define LOOP_ALIGNED_U1_A48_SSE3(DEST, LENGTH, UOP, A4OP, A8OP) \
+#endif
+#endif
+
+#define LOOP_ALIGNED_U1_A48(DEST, LENGTH, UOP, A4OP, A8OP) \
{ \
while((uintptr_t)DEST & 0xF && LENGTH) UOP \
\
@@ -429,8 +432,4 @@ mul3_sym_sse3(__m128i x, __m128i y) {
} \
}
-
-#endif
-#endif
-
#endif
--
