From a737a75dd33b4102d3bcb564524822cf821ba523 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 28 Jan 2020 11:25:16 +1100 Subject: [PATCH] Refactor wuffs_base__pixel_swizzler__prepare --- internal/cgen/base/image-impl.c | 261 ++++++++++++------------- internal/cgen/data.go | 12 +- release/c/wuffs-unsupported-snapshot.c | 261 ++++++++++++------------- 3 files changed, 254 insertions(+), 280 deletions(-) diff --git a/internal/cgen/base/image-impl.c b/internal/cgen/base/image-impl.c index 9195305d..280f02a7 100644 --- a/internal/cgen/base/image-impl.c +++ b/internal/cgen/base/image-impl.c @@ -560,6 +560,126 @@ wuffs_base__pixel_swizzler__swap_rgbx_bgrx(wuffs_base__slice_u8 dst, // -------- +static wuffs_base__pixel_swizzler__func // +wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p, + wuffs_base__pixel_format dst_format, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src_palette, + wuffs_base__pixel_blend blend) { + switch (dst_format.repr) { + case WUFFS_BASE__PIXEL_FORMAT__BGR_565: + // TODO. + break; + + case WUFFS_BASE__PIXEL_FORMAT__BGR: + 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: + case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: + case WUFFS_BASE__PIXEL_FORMAT__RGBX: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: + return wuffs_base__pixel_swizzler__xxxx__y; + } + return NULL; +} + +static wuffs_base__pixel_swizzler__func // +wuffs_base__pixel_swizzler__prepare__indexed__bgra_binary( + wuffs_base__pixel_swizzler* p, + wuffs_base__pixel_format dst_format, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src_palette, + wuffs_base__pixel_blend blend) { + switch (dst_format.repr) { + case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__copy_1_1; + } + return NULL; + + case WUFFS_BASE__PIXEL_FORMAT__BGR_565: + if (wuffs_base__pixel_swizzler__squash_bgr_565_888(dst_palette, + src_palette) != 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__xx__index__src; + } + return NULL; + + case WUFFS_BASE__PIXEL_FORMAT__BGR: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__xxx__index__src; + case WUFFS_BASE__PIXEL_BLEND__SRC_OVER: + return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over; + } + return NULL; + + case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__xxxx__index__src; + case WUFFS_BASE__PIXEL_BLEND__SRC_OVER: + return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over; + } + return NULL; + + case WUFFS_BASE__PIXEL_FORMAT__RGB: + if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette, + src_palette) != 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__xxx__index__src; + case WUFFS_BASE__PIXEL_BLEND__SRC_OVER: + return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over; + } + return NULL; + + case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: + if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette, + src_palette) != 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__xxxx__index__src; + case WUFFS_BASE__PIXEL_BLEND__SRC_OVER: + return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over; + } + return NULL; + } + return NULL; +} + wuffs_base__status // wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p, wuffs_base__pixel_format dst_format, @@ -577,146 +697,13 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p, switch (src_format.repr) { case WUFFS_BASE__PIXEL_FORMAT__Y: - switch (dst_format.repr) { - case WUFFS_BASE__PIXEL_FORMAT__BGR_565: - // TODO. - break; - - case WUFFS_BASE__PIXEL_FORMAT__BGR: - 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: - case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: - case WUFFS_BASE__PIXEL_FORMAT__RGBX: - 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; - break; - - default: - break; - } + func = wuffs_base__pixel_swizzler__prepare__y(p, dst_format, dst_palette, + src_palette, blend); break; case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: - switch (dst_format.repr) { - case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: - case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL: - case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: - if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != - 1024) { - break; - } - 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_565: - if (wuffs_base__pixel_swizzler__squash_bgr_565_888( - dst_palette, src_palette) != 1024) { - break; - } - switch (blend) { - case WUFFS_BASE__PIXEL_BLEND__SRC: - func = wuffs_base__pixel_swizzler__xx__index__src; - break; - default: - break; - } - break; - - case WUFFS_BASE__PIXEL_FORMAT__BGR: - if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != - 1024) { - break; - } - 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: - if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != - 1024) { - break; - } - 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; - } - 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: - if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette, - src_palette) != 1024) { - break; - } - 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; - } - break; - - default: + func = wuffs_base__pixel_swizzler__prepare__indexed__bgra_binary( + p, dst_format, dst_palette, src_palette, blend); break; } diff --git a/internal/cgen/data.go b/internal/cgen/data.go index 282eabe9..1eaa761f 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -47,12 +47,12 @@ const baseImageImplC = "" + "// --------\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__squash_bgr_565_888(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n size_t len4 = (dst.len < src.len ? dst.len : src.len) / 4;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n\n size_t n = len4;\n while (n--) {\n uint32_t argb = wuffs_base__load_u32le(s);\n uint32_t b5 = 0x1F & (argb >> (8 - 5));\n uint32_t g6 = 0x3F & (argb >> (16 - 6));\n uint32_t r5 = 0x1F & (argb >> (24 - 5));\n wuffs_base__store_u32le(d, (b5 << 0) | (g6 << 5) | (r5 << 11));\n s += 4;\n d += 4;\n }\n return len4 * 4;\n}\n\nstatic uint64_t //\nwuffs_base__pixel_swizzler__swap_rgbx_bgrx(wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n size_t len4 = (dst.len < src.len ? dst.len : src.len) / 4;\n uint8_t* d = dst.ptr;\n uint8_t* s = src.ptr;\n\n size_t n = len4;\n while (n--) {\n uint8_t b0 = s[0];\n uint8_t b1 = s[1];\n uint8_t b2 = s[2];\n uint8_t b3 = s[3];\n " + " d[0] = b2;\n d[1] = b1;\n d[2] = b0;\n d[3] = b3;\n s += 4;\n d += 4;\n }\n return len4 * 4;\n}\n\n" + "" + - "// --------\n\nwuffs_base__status //\nwuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n if (!p) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n\n // TODO: support many more formats.\n\n wuffs_base__pixel_swizzler__func func = NULL;\n\n switch (src_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__Y:\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n case WUFFS_BASE__PIXEL_FORMAT" + - "__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n func = wuffs_base__pixel_swizzler__xxxx__y;\n break;\n\n default:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__copy_1_1;\n break;\n " + - " default:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n if (wuffs_base__pixel_swizzler__squash_bgr_565_888(\n dst_palette, src_palette) != 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__xx__index__src;\n break;\n default:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__xxx__index__src;\n break;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n func =\n wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;\n break;\n defa" + - "ult:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__xxxx__index__src;\n break;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n func =\n wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;\n break;\n default:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n break;\n }\n switch (blend) {\n " + - "case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__xxx__index__src;\n break;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n func =\n wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;\n break;\n default:\n break;\n }\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n break;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n func = wuffs_base__pixel_swizzler__xxxx__index__src;\n break;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n func =\n wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_ove" + - "r;\n break;\n default:\n break;\n }\n break;\n\n default:\n break;\n }\n break;\n\n default:\n break;\n }\n\n p->private_impl.func = func;\n return wuffs_base__make_status(\n func ? NULL : wuffs_base__error__unsupported_pixel_swizzler_option);\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_interleaved(\n const wuffs_base__pixel_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n if (p && p->private_impl.func) {\n return (*p->private_impl.func)(dst, dst_palette, src);\n }\n return 0;\n}\n" + + "// --------\n\nstatic wuffs_base__pixel_swizzler__func //\nwuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n // TODO.\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRX:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n case WUFFS_BASE__PIXEL_FORMAT__RGBX:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n return wuf" + + "fs_base__pixel_swizzler__xxxx__y;\n }\n return NULL;\n}\n\nstatic wuffs_base__pixel_swizzler__func //\nwuffs_base__pixel_swizzler__prepare__indexed__bgra_binary(\n wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n switch (dst_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__copy_1_1;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR_565:\n if (wuffs_base__pixel_swizzler__squash_bgr_565_888(dst_palette,\n src_palette) != 1024) {\n " + + " return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xx__index__src;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGR:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xxx__index__src;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:\n if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=\n 1024) {\n return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xxxx__index__sr" + + "c;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGB:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__PIXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xxx__index__src;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;\n }\n return NULL;\n\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:\n case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:\n if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette,\n src_palette) != 1024) {\n return NULL;\n }\n switch (blend) {\n case WUFFS_BASE__P" + + "IXEL_BLEND__SRC:\n return wuffs_base__pixel_swizzler__xxxx__index__src;\n case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:\n return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;\n }\n return NULL;\n }\n return NULL;\n}\n\nwuffs_base__status //\nwuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p,\n wuffs_base__pixel_format dst_format,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__pixel_format src_format,\n wuffs_base__slice_u8 src_palette,\n wuffs_base__pixel_blend blend) {\n if (!p) {\n return wuffs_base__make_status(wuffs_base__error__bad_receiver);\n }\n\n // TODO: support many more formats.\n\n wuffs_base__pixel_swizzler__func func = NULL;\n\n switch (src_format.repr) {\n case WUFFS_BASE__PIXEL_FORMAT__Y:\n func = wuffs_base__pixel_swizzler__prepare__y(p, dst_format, dst_palette,\n" + + " src_palette, blend);\n break;\n\n case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:\n func = wuffs_base__pixel_swizzler__prepare__indexed__bgra_binary(\n p, dst_format, dst_palette, src_palette, blend);\n break;\n }\n\n p->private_impl.func = func;\n return wuffs_base__make_status(\n func ? NULL : wuffs_base__error__unsupported_pixel_swizzler_option);\n}\n\nuint64_t //\nwuffs_base__pixel_swizzler__swizzle_interleaved(\n const wuffs_base__pixel_swizzler* p,\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 dst_palette,\n wuffs_base__slice_u8 src) {\n if (p && p->private_impl.func) {\n return (*p->private_impl.func)(dst, dst_palette, src);\n }\n return 0;\n}\n" + "" const baseCorePrivateH = "" + diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 8bd72eca..a5ea3423 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -6388,6 +6388,126 @@ wuffs_base__pixel_swizzler__swap_rgbx_bgrx(wuffs_base__slice_u8 dst, // -------- +static wuffs_base__pixel_swizzler__func // +wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p, + wuffs_base__pixel_format dst_format, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src_palette, + wuffs_base__pixel_blend blend) { + switch (dst_format.repr) { + case WUFFS_BASE__PIXEL_FORMAT__BGR_565: + // TODO. + break; + + case WUFFS_BASE__PIXEL_FORMAT__BGR: + 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: + case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: + case WUFFS_BASE__PIXEL_FORMAT__RGBX: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: + return wuffs_base__pixel_swizzler__xxxx__y; + } + return NULL; +} + +static wuffs_base__pixel_swizzler__func // +wuffs_base__pixel_swizzler__prepare__indexed__bgra_binary( + wuffs_base__pixel_swizzler* p, + wuffs_base__pixel_format dst_format, + wuffs_base__slice_u8 dst_palette, + wuffs_base__slice_u8 src_palette, + wuffs_base__pixel_blend blend) { + switch (dst_format.repr) { + case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__copy_1_1; + } + return NULL; + + case WUFFS_BASE__PIXEL_FORMAT__BGR_565: + if (wuffs_base__pixel_swizzler__squash_bgr_565_888(dst_palette, + src_palette) != 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__xx__index__src; + } + return NULL; + + case WUFFS_BASE__PIXEL_FORMAT__BGR: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__xxx__index__src; + case WUFFS_BASE__PIXEL_BLEND__SRC_OVER: + return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over; + } + return NULL; + + case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: + if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != + 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__xxxx__index__src; + case WUFFS_BASE__PIXEL_BLEND__SRC_OVER: + return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over; + } + return NULL; + + case WUFFS_BASE__PIXEL_FORMAT__RGB: + if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette, + src_palette) != 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__xxx__index__src; + case WUFFS_BASE__PIXEL_BLEND__SRC_OVER: + return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over; + } + return NULL; + + case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: + case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY: + if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette, + src_palette) != 1024) { + return NULL; + } + switch (blend) { + case WUFFS_BASE__PIXEL_BLEND__SRC: + return wuffs_base__pixel_swizzler__xxxx__index__src; + case WUFFS_BASE__PIXEL_BLEND__SRC_OVER: + return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over; + } + return NULL; + } + return NULL; +} + wuffs_base__status // wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p, wuffs_base__pixel_format dst_format, @@ -6405,146 +6525,13 @@ wuffs_base__pixel_swizzler__prepare(wuffs_base__pixel_swizzler* p, switch (src_format.repr) { case WUFFS_BASE__PIXEL_FORMAT__Y: - switch (dst_format.repr) { - case WUFFS_BASE__PIXEL_FORMAT__BGR_565: - // TODO. - break; - - case WUFFS_BASE__PIXEL_FORMAT__BGR: - 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: - case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY: - case WUFFS_BASE__PIXEL_FORMAT__RGBX: - 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; - break; - - default: - break; - } + func = wuffs_base__pixel_swizzler__prepare__y(p, dst_format, dst_palette, + src_palette, blend); break; case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: - switch (dst_format.repr) { - case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: - case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL: - case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY: - if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != - 1024) { - break; - } - 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_565: - if (wuffs_base__pixel_swizzler__squash_bgr_565_888( - dst_palette, src_palette) != 1024) { - break; - } - switch (blend) { - case WUFFS_BASE__PIXEL_BLEND__SRC: - func = wuffs_base__pixel_swizzler__xx__index__src; - break; - default: - break; - } - break; - - case WUFFS_BASE__PIXEL_FORMAT__BGR: - if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != - 1024) { - break; - } - 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: - if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) != - 1024) { - break; - } - 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; - } - 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: - if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(dst_palette, - src_palette) != 1024) { - break; - } - 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; - } - break; - - default: + func = wuffs_base__pixel_swizzler__prepare__indexed__bgra_binary( + p, dst_format, dst_palette, src_palette, blend); break; }