sw_engine raster: adding antialiasing to the gradient rastering functions

The gradient rastering functions with composition did not take
antialiasing into account. The missing part has been added.
This commit is contained in:
Mira Grudzinska 2021-04-07 15:29:22 +02:00 committed by Hermet Park
parent 9d7a264610
commit fcad63ec1f

View file

@ -754,7 +754,7 @@ static bool _rasterTranslucentLinearGradientRle(SwSurface* surface, const SwRleD
for (uint32_t i = 0; i < rle->size; ++i) { for (uint32_t i = 0; i < rle->size; ++i) {
auto dst = &surface->buffer[span->y * surface->stride + span->x]; auto dst = &surface->buffer[span->y * surface->stride + span->x];
fillFetchLinear(fill, buf, span->y, span->x, span->len); fillFetchLinear(fill, buf, span->y, span->x, span->len);
if (span->coverage == 255) { if (span->coverage == 255) {
for (uint32_t i = 0; i < span->len; ++i) { for (uint32_t i = 0; i < span->len; ++i) {
dst[i] = buf[i] + ALPHA_BLEND(dst[i], 255 - surface->blender.alpha(buf[i])); dst[i] = buf[i] + ALPHA_BLEND(dst[i], 255 - surface->blender.alpha(buf[i]));
} }
@ -789,9 +789,18 @@ static bool _rasterOpaqueLinearGradientRle(SwSurface* surface, const SwRleData*
auto dst = &surface->buffer[span->y * surface->stride + span->x]; auto dst = &surface->buffer[span->y * surface->stride + span->x];
auto cmp = &cbuffer[span->y * surface->stride + span->x]; auto cmp = &cbuffer[span->y * surface->stride + span->x];
auto src = buf; auto src = buf;
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) { if (span->coverage == 255) {
auto tmp = ALPHA_BLEND(*src, surface->blender.alpha(*cmp)); for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) {
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp)); auto tmp = ALPHA_BLEND(*src, surface->blender.alpha(*cmp));
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp));
}
} else {
auto ialpha = 255 - span->coverage;
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) {
auto tmp = ALPHA_BLEND(*src, surface->blender.alpha(*cmp));
tmp = ALPHA_BLEND(tmp, span->coverage) + ALPHA_BLEND(*dst, ialpha);
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp));
}
} }
} }
} else if (method == CompositeMethod::InvAlphaMask) { } else if (method == CompositeMethod::InvAlphaMask) {
@ -800,9 +809,18 @@ static bool _rasterOpaqueLinearGradientRle(SwSurface* surface, const SwRleData*
auto dst = &surface->buffer[span->y * surface->stride + span->x]; auto dst = &surface->buffer[span->y * surface->stride + span->x];
auto cmp = &cbuffer[span->y * surface->stride + span->x]; auto cmp = &cbuffer[span->y * surface->stride + span->x];
auto src = buf; auto src = buf;
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) { if (span->coverage == 255) {
auto tmp = ALPHA_BLEND(*src, 255 - surface->blender.alpha(*cmp)); for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) {
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp)); auto tmp = ALPHA_BLEND(*src, 255 - surface->blender.alpha(*cmp));
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp));
}
} else {
auto ialpha = 255 - span->coverage;
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) {
auto tmp = ALPHA_BLEND(*src, 255 - surface->blender.alpha(*cmp));
tmp = ALPHA_BLEND(tmp, span->coverage) + ALPHA_BLEND(*dst, ialpha);
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp));
}
} }
} }
} }
@ -872,9 +890,18 @@ static bool _rasterOpaqueRadialGradientRle(SwSurface* surface, const SwRleData*
auto dst = &surface->buffer[span->y * surface->stride + span->x]; auto dst = &surface->buffer[span->y * surface->stride + span->x];
auto cmp = &cbuffer[span->y * surface->stride + span->x]; auto cmp = &cbuffer[span->y * surface->stride + span->x];
auto src = buf; auto src = buf;
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) { if (span->coverage == 255) {
auto tmp = ALPHA_BLEND(*src, surface->blender.alpha(*cmp)); for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) {
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp)); auto tmp = ALPHA_BLEND(*src, surface->blender.alpha(*cmp));
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp));
}
} else {
auto ialpha = 255 - span->coverage;
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) {
auto tmp = ALPHA_BLEND(*src, surface->blender.alpha(*cmp));
tmp = ALPHA_BLEND(tmp, span->coverage) + ALPHA_BLEND(*dst, ialpha);
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp));
}
} }
} }
} else if (method == CompositeMethod::InvAlphaMask) { } else if (method == CompositeMethod::InvAlphaMask) {
@ -883,9 +910,18 @@ static bool _rasterOpaqueRadialGradientRle(SwSurface* surface, const SwRleData*
auto dst = &surface->buffer[span->y * surface->stride + span->x]; auto dst = &surface->buffer[span->y * surface->stride + span->x];
auto cmp = &cbuffer[span->y * surface->stride + span->x]; auto cmp = &cbuffer[span->y * surface->stride + span->x];
auto src = buf; auto src = buf;
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) { if (span->coverage == 255) {
auto tmp = ALPHA_BLEND(*src, 255 - surface->blender.alpha(*cmp)); for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) {
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp)); auto tmp = ALPHA_BLEND(*src, 255 - surface->blender.alpha(*cmp));
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp));
}
} else {
auto ialpha = 255 - span->coverage;
for (uint32_t x = 0; x < span->len; ++x, ++dst, ++cmp, ++src) {
auto tmp = ALPHA_BLEND(*src, 255 - surface->blender.alpha(*cmp));
tmp = ALPHA_BLEND(tmp, span->coverage) + ALPHA_BLEND(*dst, ialpha);
*dst = tmp + ALPHA_BLEND(*dst, 255 - surface->blender.alpha(tmp));
}
} }
} }
} }