git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-14 12:04:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

sw_engine neon: fix the iterations number of 'neon calls'

Browse source 
In the case, when the dst memory was not aligned,
we went out of the dst range in the 'neon loop'.
This commit is contained in:
Mira Grudzinska 2021-08-25 10:49:51 +02:00 • committed by Hermet Park
parent 4b8229f1c3
commit 36ac948ec9
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/lib/sw_engine/tvgSwRasterNeon.h
View file

@ -99,26 +99,28 @@ static inline bool neonRasterTranslucentRect(SwSurface* surface, const SwBBox& r
auto vColor = static_cast<uint8x8_t>(vdup_n_u32(color)); auto vColor = static_cast<uint8x8_t>(vdup_n_u32(color));
auto vIalpha = static_cast<uint8x8_t>(vdup_n_u8((uint8_t) ialpha)); auto vIalpha = static_cast<uint8x8_t>(vdup_n_u8((uint8_t) ialpha));
uint8x8_t* vDst = nullptr; uint8x8_t* vDst = nullptr;
uint32_t align;
for (uint32_t y = 0; y < h; ++y) { for (uint32_t y = 0; y < h; ++y) {
auto dst = &buffer[y * surface->stride]; auto dst = &buffer[y * surface->stride];
if ((((uint32_t) dst) & 0x7) != 0) { if ((((uint32_t) dst) & 0x7) != 0) {
//fill not aligned byte //fill not aligned byte
*dst = color + ALPHA_BLEND(*dst, ialpha); *dst = color + ALPHA_BLEND(*dst, ialpha);
vDst = (uint8x8_t*) (dst + 1); vDst = (uint8x8_t*) (dst + 1);
align = 1;
} else { } else {
vDst = (uint8x8_t*) dst; vDst = (uint8x8_t*) dst;
align = 0;
} }
for (uint32_t x = 0; x < w / 2; ++x) for (uint32_t x = 0; x < (w - align) / 2; ++x)
vDst[x] = vadd_u8(vColor, ALPHA_BLEND_NEON(vDst[x], vIalpha)); vDst[x] = vadd_u8(vColor, ALPHA_BLEND_NEON(vDst[x], vIalpha));
auto leftovers = w % 2; auto leftovers = (w - align) % 2;
if (leftovers > 0) dst[w - 1] = color + ALPHA_BLEND(dst[w - 1], ialpha); if (leftovers > 0) dst[w - 1] = color + ALPHA_BLEND(dst[w - 1], ialpha);
} }
return true; return true;
} }
#endif #endif