Add WUFFS_BASE__PIXEL_BLEND__SRC_OVER

This commit is contained in:
Nigel Tao committed 2020-01-24 11:32:13 +11:00
1 parent 621bd9505d
commit 4a83eba3f9
5 files changed
+421 -52

No files matched your search

+193 -19
View File
@@ -1483,6 +1483,7 @@ typedef uint8_t wuffs_base__pixel_blend;
//
// TODO: implement the other modes.
#define WUFFS_BASE__PIXEL_BLEND__SRC ((wuffs_base__pixel_blend)0)
#define WUFFS_BASE__PIXEL_BLEND__SRC_OVER ((wuffs_base__pixel_blend)1)
// --------
@@ -5818,9 +5819,9 @@ wuffs_base__pixel_swizzler__copy_1_1(wuffs_base__slice_u8 dst,
}
static uint64_t //
wuffs_base__pixel_swizzler__xxx_index(wuffs_base__slice_u8 dst,
wuffs_base__slice_u8 dst_palette,
wuffs_base__slice_u8 src) {
wuffs_base__pixel_swizzler__xxx__index__src(wuffs_base__slice_u8 dst,
wuffs_base__slice_u8 dst_palette,
wuffs_base__slice_u8 src) {
if (dst_palette.len != 1024) {
return 0;
}
@@ -5859,11 +5860,11 @@ wuffs_base__pixel_swizzler__xxx_index(wuffs_base__slice_u8 dst,
}
while (n >= 1) {
uint32_t color =
uint32_t s0 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[0]) * 4));
d[0] = (uint8_t)(color >> 0);
d[1] = (uint8_t)(color >> 8);
d[2] = (uint8_t)(color >> 16);
d[0] = (uint8_t)(s0 >> 0);
d[1] = (uint8_t)(s0 >> 8);
d[2] = (uint8_t)(s0 >> 16);
s += 1 * 1;
d += 3 * 1;
@@ -5874,9 +5875,68 @@ wuffs_base__pixel_swizzler__xxx_index(wuffs_base__slice_u8 dst,
}
static uint64_t //
wuffs_base__pixel_swizzler__xxxx_index(wuffs_base__slice_u8 dst,
wuffs_base__slice_u8 dst_palette,
wuffs_base__slice_u8 src) {
wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over(
wuffs_base__slice_u8 dst,
wuffs_base__slice_u8 dst_palette,
wuffs_base__slice_u8 src) {
if (dst_palette.len != 1024) {
return 0;
}
size_t dst_len3 = dst.len / 3;
size_t len = dst_len3 < src.len ? dst_len3 : src.len;
uint8_t* d = dst.ptr;
uint8_t* s = src.ptr;
size_t n = len;
// N is the loop unroll count.
const int N = 4;
while (n >= N) {
uint32_t s0 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[0]) * 4));
if (s0) {
wuffs_base__store_u24le(d + (0 * 4), s0);
}
uint32_t s1 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[1]) * 4));
if (s1) {
wuffs_base__store_u24le(d + (1 * 4), s1);
}
uint32_t s2 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[2]) * 4));
if (s2) {
wuffs_base__store_u24le(d + (2 * 4), s2);
}
uint32_t s3 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[3]) * 4));
if (s3) {
wuffs_base__store_u24le(d + (3 * 4), s3);
}
s += 1 * N;
d += 3 * N;
n -= (size_t)(1 * N);
}
while (n >= 1) {
uint32_t s0 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[0]) * 4));
if (s0) {
wuffs_base__store_u24le(d + (0 * 4), s0);
}
s += 1 * 1;
d += 3 * 1;
n -= (size_t)(1 * 1);
}
return len;
}
static uint64_t //
wuffs_base__pixel_swizzler__xxxx__index__src(wuffs_base__slice_u8 dst,
wuffs_base__slice_u8 dst_palette,
wuffs_base__slice_u8 src) {
if (dst_palette.len != 1024) {
return 0;
}
@@ -5922,9 +5982,68 @@ wuffs_base__pixel_swizzler__xxxx_index(wuffs_base__slice_u8 dst,
}
static uint64_t //
wuffs_base__pixel_swizzler__xxxx_y(wuffs_base__slice_u8 dst,
wuffs_base__slice_u8 dst_palette,
wuffs_base__slice_u8 src) {
wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over(
wuffs_base__slice_u8 dst,
wuffs_base__slice_u8 dst_palette,
wuffs_base__slice_u8 src) {
if (dst_palette.len != 1024) {
return 0;
}
size_t dst_len4 = dst.len / 4;
size_t len = dst_len4 < src.len ? dst_len4 : src.len;
uint8_t* d = dst.ptr;
uint8_t* s = src.ptr;
size_t n = len;
// N is the loop unroll count.
const int N = 4;
while (n >= N) {
uint32_t s0 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[0]) * 4));
if (s0) {
wuffs_base__store_u32le(d + (0 * 4), s0);
}
uint32_t s1 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[1]) * 4));
if (s1) {
wuffs_base__store_u32le(d + (1 * 4), s1);
}
uint32_t s2 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[2]) * 4));
if (s2) {
wuffs_base__store_u32le(d + (2 * 4), s2);
}
uint32_t s3 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[3]) * 4));
if (s3) {
wuffs_base__store_u32le(d + (3 * 4), s3);
}
s += 1 * N;
d += 4 * N;
n -= (size_t)(1 * N);
}
while (n >= 1) {
uint32_t s0 =
wuffs_base__load_u32le(dst_palette.ptr + ((uint32_t)(s[0]) * 4));
if (s0) {
wuffs_base__store_u32le(d + (0 * 4), s0);
}
s += 1 * 1;
d += 4 * 1;
n -= (size_t)(1 * 1);
}
return len;
}
static uint64_t //
wuffs_base__pixel_swizzler__xxxx__y(wuffs_base__slice_u8 dst,
wuffs_base__slice_u8 dst_palette,
wuffs_base__slice_u8 src) {
size_t dst_len4 = dst.len / 4;
size_t len = dst_len4 < src.len ? dst_len4 : src.len;
uint8_t* d = dst.ptr;
@@ -5968,6 +6087,8 @@ wuffs_base__pixel_swizzler__swap_rgbx_bgrx(wuffs_base__slice_u8 dst,
return len4 * 4;
}
// --------
wuffs_base__status //
wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,
wuffs_base__pixel_format dst_format,
@@ -5991,6 +6112,7 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,
case WUFFS_BASE__PIXEL_FORMAT__RGB:
// TODO.
break;
case WUFFS_BASE__PIXEL_FORMAT__BGRX:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
@@ -5999,8 +6121,9 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
func = wuffs_base__pixel_swizzler__xxxx_y;
func = wuffs_base__pixel_swizzler__xxxx__y;
break;
default:
break;
}
@@ -6015,15 +6138,33 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,
1024) {
break;
}
func = wuffs_base__pixel_swizzler__copy_1_1;
switch (blend) {
case WUFFS_BASE__PIXEL_BLEND__SRC:
func = wuffs_base__pixel_swizzler__copy_1_1;
break;
default:
break;
}
break;
case WUFFS_BASE__PIXEL_FORMAT__BGR:
if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
1024) {
break;
}
func = wuffs_base__pixel_swizzler__xxx_index;
switch (blend) {
case WUFFS_BASE__PIXEL_BLEND__SRC:
func = wuffs_base__pixel_swizzler__xxx__index__src;
break;
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
func =
wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;
break;
default:
break;
}
break;
case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
@@ -6031,15 +6172,37 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,
1024) {
break;
}
func = wuffs_base__pixel_swizzler__xxxx_index;
switch (blend) {
case WUFFS_BASE__PIXEL_BLEND__SRC:
func = wuffs_base__pixel_swizzler__xxxx__index__src;
break;
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
func =
wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;
break;
default:
break;
}
break;
case WUFFS_BASE__PIXEL_FORMAT__RGB:
if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,
src_palette) != 1024) {
break;
}
func = wuffs_base__pixel_swizzler__xxx_index;
switch (blend) {
case WUFFS_BASE__PIXEL_BLEND__SRC:
func = wuffs_base__pixel_swizzler__xxx__index__src;
break;
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
func =
wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;
break;
default:
break;
}
break;
case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
@@ -6047,8 +6210,19 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,
src_palette) != 1024) {
break;
}
func = wuffs_base__pixel_swizzler__xxxx_index;
switch (blend) {
case WUFFS_BASE__PIXEL_BLEND__SRC:
func = wuffs_base__pixel_swizzler__xxxx__index__src;
break;
case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
func =
wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;
break;
default:
break;
}
break;
default:
break;
}