summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChunEon Park <hermet@hermet.pe.kr>2014-02-08 18:36:18 +0900
committerChunEon Park <hermet@hermet.pe.kr>2014-02-08 18:36:18 +0900
commit8775e0e58dfe9eb50a30c0dedf3af602eb8f04c6 (patch)
tree260df1780ca8c8ee75812856e78230d17602bd4e /src
parentf0b1854d1056766be2ea4db59fff2e226e6c0358 (diff)
evas/common - fix indentation
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/common/evas_map_image_loop.c71
1 files changed, 37 insertions, 34 deletions
diff --git a/src/lib/evas/common/evas_map_image_loop.c b/src/lib/evas/common/evas_map_image_loop.c
index ec5d3266fd..d77ef988a4 100644
--- a/src/lib/evas/common/evas_map_image_loop.c
+++ b/src/lib/evas/common/evas_map_image_loop.c
@@ -6,7 +6,8 @@
6 MOV_P2R(c1, mm7, mm0); // col 6 MOV_P2R(c1, mm7, mm0); // col
7# endif 7# endif
8# endif 8# endif
9# endif 9# endif //SCALE_USING_MMX
10
10# ifdef SCALE_USING_NEON 11# ifdef SCALE_USING_NEON
11 FPU_NEON; 12 FPU_NEON;
12 VMOV_I2R_NEON(q2, #255); 13 VMOV_I2R_NEON(q2, #255);
@@ -26,46 +27,44 @@
26 // here we have c1 and c2 spread through q9 register 27 // here we have c1 and c2 spread through q9 register
27# endif 28# endif
28# endif 29# endif
29# endif 30# endif //SCALE_USING_NEON
30 while (ww > 0) 31
32 while (ww > 0)
31 { 33 {
32# ifdef COLBLACK 34# ifdef COLBLACK
33 *d = 0xff000000; // col 35 *d = 0xff000000; // col
34# else 36# else
35 FPc u1, v1, u2, v2; 37 FPc u1, v1, u2, v2;
36 FPc rv, ru; 38 FPc rv, ru;
37 DATA32 val1, val2, val3, val4; 39 DATA32 val1, val2, val3, val4;
38 40
39 u1 = u; 41 u1 = u;
40 if (u1 < 0) u1 = 0; 42 if (u1 < 0) u1 = 0;
41 else if (u1 >= swp) u1 = swp - 1; 43 else if (u1 >= swp) u1 = swp - 1;
42 44
43 v1 = v; 45 v1 = v;
44 if (v1 < 0) v1 = 0; 46 if (v1 < 0) v1 = 0;
45 else if (v1 >= shp) v1 = shp - 1; 47 else if (v1 >= shp) v1 = shp - 1;
46 48
47 u2 = u1 + FPFPI1; 49 u2 = u1 + FPFPI1;
48 if (u2 >= swp) u2 = swp - 1; 50 if (u2 >= swp) u2 = swp - 1;
49 51
50 v2 = v1 + FPFPI1; 52 v2 = v1 + FPFPI1;
51 if (v2 >= shp) v2 = shp - 1; 53 if (v2 >= shp) v2 = shp - 1;
52 54
53 ru = (u >> (FP + FPI - 8)) & 0xff; 55 ru = (u >> (FP + FPI - 8)) & 0xff;
54 rv = (v >> (FP + FPI - 8)) & 0xff; 56 rv = (v >> (FP + FPI - 8)) & 0xff;
55 57
56 s = sp + ((v1 >> (FP + FPI)) * sw) + 58 s = sp + ((v1 >> (FP + FPI)) * sw) + (u1 >> (FP + FPI));
57 (u1 >> (FP + FPI));
58 val1 = *s; 59 val1 = *s;
59 s = sp + ((v1 >> (FP + FPI)) * sw) + 60 s = sp + ((v1 >> (FP + FPI)) * sw) + (u2 >> (FP + FPI));
60 (u2 >> (FP + FPI));
61 val2 = *s; 61 val2 = *s;
62 62
63 s = sp + ((v2 >> (FP + FPI)) * sw) + 63 s = sp + ((v2 >> (FP + FPI)) * sw) + (u1 >> (FP + FPI));
64 (u1 >> (FP + FPI));
65 val3 = *s; 64 val3 = *s;
66 s = sp + ((v2 >> (FP + FPI)) * sw) + 65 s = sp + ((v2 >> (FP + FPI)) * sw) + (u2 >> (FP + FPI));
67 (u2 >> (FP + FPI));
68 val4 = *s; 66 val4 = *s;
67
69# ifdef SCALE_USING_MMX 68# ifdef SCALE_USING_MMX
70 MOV_A2R(rv, mm4); 69 MOV_A2R(rv, mm4);
71 MOV_A2R(ru, mm6); 70 MOV_A2R(ru, mm6);
@@ -86,7 +85,7 @@
86# ifdef COLSAME 85# ifdef COLSAME
87// MOV_P2R(c1, mm7, mm0); // col 86// MOV_P2R(c1, mm7, mm0); // col
88 MUL4_SYM_R2R(mm7, mm1, mm5); // col 87 MUL4_SYM_R2R(mm7, mm1, mm5); // col
89# else 88# else
90 cc = cv >> 16; // col 89 cc = cv >> 16; // col
91 cv += cd; // col 90 cv += cd; // col
92 MOV_A2R(cc, mm2); // col 91 MOV_A2R(cc, mm2); // col
@@ -94,8 +93,8 @@
94 MOV_P2R(c2, mm4, mm0); // col 93 MOV_P2R(c2, mm4, mm0); // col
95 INTERP_256_R2R(mm2, mm4, mm3, mm5); // col 94 INTERP_256_R2R(mm2, mm4, mm3, mm5); // col
96 MUL4_SYM_R2R(mm3, mm1, mm5); // col 95 MUL4_SYM_R2R(mm3, mm1, mm5); // col
97# endif 96# endif
98# endif 97# endif
99 MOV_R2P(mm1, *d, mm0); 98 MOV_R2P(mm1, *d, mm0);
100# elif defined SCALE_USING_NEON 99# elif defined SCALE_USING_NEON
101 // not sure if we need this condition, but it doesn't affect the result 100 // not sure if we need this condition, but it doesn't affect the result
@@ -122,13 +121,18 @@
122 VMOV_R2R_NEON(d9, d0); 121 VMOV_R2R_NEON(d9, d0);
123 VMOV_R2R_NEON(d11, d2); 122 VMOV_R2R_NEON(d11, d2);
124 // by this point we have all required data in right registers 123 // by this point we have all required data in right registers
125 INTERP_256_NEON(q3, q5, q4, q2); // interpolate val1,val2 and val3,val4 124 // interpolate val1,val2 and val3,val4
125 INTERP_256_NEON(q3, q5, q4, q2);
126# ifdef COLMUL 126# ifdef COLMUL
127# ifdef COLSAME 127# ifdef COLSAME
128 INTERP_256_NEON(d14, d9, d8, d4); 128 INTERP_256_NEON(d14, d9, d8, d4);
129# else 129# else
130 VSWP_NEON(d9, d12); // move result of val3,val4 interpolation (and c1 if COLMUL is defined) for next step 130 /* move result of val3,val4 interpolation (and c1 if COLMUL is
131 INTERP_256_NEON(q7, q6, q4, q2); // second stage of interpolation, also here c1 and c2 are interpolated 131 defined) for next step */
132 VSWP_NEON(d9, d12);
133 /* second stage of interpolation, also here c1 and c2 are
134 interpolated */
135 INTERP_256_NEON(q7, q6, q4, q2);
132# endif 136# endif
133# else 137# else
134 INTERP_256_NEON(d14, d9, d8, d4); 138 INTERP_256_NEON(d14, d9, d8, d4);
@@ -148,21 +152,21 @@
148 val1 = INTERP_256(ru, val2, val1); 152 val1 = INTERP_256(ru, val2, val1);
149 val3 = INTERP_256(ru, val4, val3); 153 val3 = INTERP_256(ru, val4, val3);
150 val1 = INTERP_256(rv, val3, val1); // col 154 val1 = INTERP_256(rv, val3, val1); // col
151# ifdef COLMUL 155# ifdef COLMUL
152# ifdef COLSAME 156# ifdef COLSAME
153 *d = MUL4_SYM(c1, val1); 157 *d = MUL4_SYM(c1, val1);
154# else 158# else
155 val2 = INTERP_256((cv >> 16), c2, c1); // col 159 val2 = INTERP_256((cv >> 16), c2, c1); // col
156 *d = MUL4_SYM(val2, val1); // col 160 *d = MUL4_SYM(val2, val1); // col
157 cv += cd; // col 161 cv += cd; // col
158# endif 162# endif
159# else 163# else
160 *d = val1; 164 *d = val1;
161# endif 165# endif
162# endif 166# endif
163 u += ud; 167 u += ud;
164 v += vd; 168 v += vd;
165# endif 169# endif //COLBLACK
166 d++; 170 d++;
167 ww--; 171 ww--;
168 } 172 }
@@ -205,8 +209,7 @@
205# ifdef COLBLACK 209# ifdef COLBLACK
206 *d = 0xff000000; // col 210 *d = 0xff000000; // col
207# else 211# else
208 s = sp + ((v >> (FP + FPI)) * sw) + 212 s = sp + ((v >> (FP + FPI)) * sw) + (u >> (FP + FPI));
209 (u >> (FP + FPI));
210# ifdef COLMUL 213# ifdef COLMUL
211 val1 = *s; // col 214 val1 = *s; // col
212# ifdef COLSAME 215# ifdef COLSAME
@@ -240,7 +243,7 @@
240/* 243/*
241# endif 244# endif
242 */ 245 */
243# endif 246# endif
244# else 247# else
245 *d = *s; 248 *d = *s;
246# endif 249# endif