From 1b0900ac73d4a88d88dd87d0b882a0d8ef853d27 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 11 Jun 2023 10:41:02 +1000 Subject: [PATCH] cgen: re-organize patch_pixconv.go generated funcs --- internal/cgen/patch_pixconv.go | 59 ++++--- release/c/wuffs-unsupported-snapshot.c | 228 ++++++++++++------------- 2 files changed, 151 insertions(+), 136 deletions(-) diff --git a/internal/cgen/patch_pixconv.go b/internal/cgen/patch_pixconv.go index 90d0a9d9..5d0fb38b 100644 --- a/internal/cgen/patch_pixconv.go +++ b/internal/cgen/patch_pixconv.go @@ -76,6 +76,43 @@ func insertBasePixConvSubmoduleYcckC(buf *buffer) error { // ---- + generalHv11Patches := []struct { + newFuncNameLine string + patchMap map[string]string + }{{ + + "wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11(\n", + map[string]string{ + "// ¡ dst_iter = etc\n": dstIterEtcSansX, + "// ¡ BEGIN set_color_u32_at\n": strings.Replace(setColorU32AtSrcIter, "_FLAVOR", "", 1), + "// ¡ BEGIN declare iy\n": "", + "// ¡ BEGIN declare ix\n": "", + "// ¡ BEGIN use ix\n": useIxHv11, + "// ¡ BEGIN use iy\n": useIyHv11, + }, + }, { + + "wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11(\n", + map[string]string{ + "// ¡ dst_iter = etc\n": dstIterEtcSansX, + "// ¡ BEGIN set_color_u32_at\n": strings.Replace(setColorU32AtSrcIter, "_FLAVOR", "_abgr", 1), + "// ¡ BEGIN declare iy\n": "", + "// ¡ BEGIN declare ix\n": "", + "// ¡ BEGIN use ix\n": useIxHv11, + "// ¡ BEGIN use iy\n": useIyHv11, + }, + }} + + for _, p := range generalHv11Patches { + const oldFuncNameLine = "wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter(\n" + p.patchMap[oldFuncNameLine] = p.newFuncNameLine + if err := patchCFunc(buf, generalBoxFilter, oldFuncNameLine, p.patchMap); err != nil { + return err + } + } + + // ---- + generalTriangleFilterPatches := []struct { newFuncNameLine string patchMap map[string]string @@ -122,28 +159,6 @@ func insertBasePixConvSubmoduleYcckC(buf *buffer) error { "// ¡ dst_iter = etc\n": dstIterEtcSansX, "// ¡ BEGIN set_color_u32_at\n": strings.Replace(setColorU32AtSrcIter, "_FLAVOR", "_abgr", 1), }, - }, { - - "wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11(\n", - map[string]string{ - "// ¡ dst_iter = etc\n": dstIterEtcSansX, - "// ¡ BEGIN set_color_u32_at\n": strings.Replace(setColorU32AtSrcIter, "_FLAVOR", "", 1), - "// ¡ BEGIN declare iy\n": "", - "// ¡ BEGIN declare ix\n": "", - "// ¡ BEGIN use ix\n": useIxHv11, - "// ¡ BEGIN use iy\n": useIyHv11, - }, - }, { - - "wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11(\n", - map[string]string{ - "// ¡ dst_iter = etc\n": dstIterEtcSansX, - "// ¡ BEGIN set_color_u32_at\n": strings.Replace(setColorU32AtSrcIter, "_FLAVOR", "_abgr", 1), - "// ¡ BEGIN declare iy\n": "", - "// ¡ BEGIN declare ix\n": "", - "// ¡ BEGIN use ix\n": useIxHv11, - "// ¡ BEGIN use iy\n": useIyHv11, - }, }} for _, p := range generalBoxFilterPatches { diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 567e325b..10406016 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -23364,6 +23364,120 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( // -------- +// Specializes wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter. +static void // +wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11( + wuffs_base__pixel_buffer* dst, + uint32_t width, + uint32_t height, + const uint8_t* src_ptr0, + const uint8_t* src_ptr1, + const uint8_t* src_ptr2, + uint32_t stride0, + uint32_t stride1, + uint32_t stride2, + uint32_t inv_h0, + uint32_t inv_h1, + uint32_t inv_h2, + uint32_t inv_v0, + uint32_t inv_v1, + uint32_t inv_v2, + uint32_t half_width_for_2to1, + uint32_t half_height_for_2to1, + uint8_t* scratch_buffer_2k_ptr) { + uint32_t y = 0u; + while (true) { + const uint8_t* src_iter0 = src_ptr0; + const uint8_t* src_iter1 = src_ptr1; + const uint8_t* src_iter2 = src_ptr2; + + size_t dst_stride = dst->private_impl.planes[0].stride; + uint8_t* dst_iter = + dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)); + + uint32_t x = 0u; + while (true) { + wuffs_base__poke_u32le__no_bounds_check( + dst_iter, wuffs_base__color_ycc__as__color_u32( + *src_iter0, *src_iter1, *src_iter2)); + dst_iter += 4; + + if ((x + 1u) == width) { + break; + } + x = x + 1u; + src_iter0++; + src_iter1++; + src_iter2++; + } + + if ((y + 1u) == height) { + break; + } + y = y + 1u; + src_ptr0 += stride0; + src_ptr1 += stride1; + src_ptr2 += stride2; + } +} + +// Specializes wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter. +static void // +wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11( + wuffs_base__pixel_buffer* dst, + uint32_t width, + uint32_t height, + const uint8_t* src_ptr0, + const uint8_t* src_ptr1, + const uint8_t* src_ptr2, + uint32_t stride0, + uint32_t stride1, + uint32_t stride2, + uint32_t inv_h0, + uint32_t inv_h1, + uint32_t inv_h2, + uint32_t inv_v0, + uint32_t inv_v1, + uint32_t inv_v2, + uint32_t half_width_for_2to1, + uint32_t half_height_for_2to1, + uint8_t* scratch_buffer_2k_ptr) { + uint32_t y = 0u; + while (true) { + const uint8_t* src_iter0 = src_ptr0; + const uint8_t* src_iter1 = src_ptr1; + const uint8_t* src_iter2 = src_ptr2; + + size_t dst_stride = dst->private_impl.planes[0].stride; + uint8_t* dst_iter = + dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)); + + uint32_t x = 0u; + while (true) { + wuffs_base__poke_u32le__no_bounds_check( + dst_iter, wuffs_base__color_ycc__as__color_u32_abgr( + *src_iter0, *src_iter1, *src_iter2)); + dst_iter += 4; + + if ((x + 1u) == width) { + break; + } + x = x + 1u; + src_iter0++; + src_iter1++; + src_iter2++; + } + + if ((y + 1u) == height) { + break; + } + y = y + 1u; + src_ptr0 += stride0; + src_ptr1 += stride1; + src_ptr2 += stride2; + } +} + // Specializes wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter. static void // wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__triangle_filter( @@ -23828,120 +23942,6 @@ wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__box_filter( } } -// Specializes wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter. -static void // -wuffs_base__pixel_swizzler__swizzle_ycc__bgrx__hv11( - wuffs_base__pixel_buffer* dst, - uint32_t width, - uint32_t height, - const uint8_t* src_ptr0, - const uint8_t* src_ptr1, - const uint8_t* src_ptr2, - uint32_t stride0, - uint32_t stride1, - uint32_t stride2, - uint32_t inv_h0, - uint32_t inv_h1, - uint32_t inv_h2, - uint32_t inv_v0, - uint32_t inv_v1, - uint32_t inv_v2, - uint32_t half_width_for_2to1, - uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { - uint32_t y = 0u; - while (true) { - const uint8_t* src_iter0 = src_ptr0; - const uint8_t* src_iter1 = src_ptr1; - const uint8_t* src_iter2 = src_ptr2; - - size_t dst_stride = dst->private_impl.planes[0].stride; - uint8_t* dst_iter = - dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)); - - uint32_t x = 0u; - while (true) { - wuffs_base__poke_u32le__no_bounds_check( - dst_iter, wuffs_base__color_ycc__as__color_u32( - *src_iter0, *src_iter1, *src_iter2)); - dst_iter += 4; - - if ((x + 1u) == width) { - break; - } - x = x + 1u; - src_iter0++; - src_iter1++; - src_iter2++; - } - - if ((y + 1u) == height) { - break; - } - y = y + 1u; - src_ptr0 += stride0; - src_ptr1 += stride1; - src_ptr2 += stride2; - } -} - -// Specializes wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter. -static void // -wuffs_base__pixel_swizzler__swizzle_ycc__rgbx__hv11( - wuffs_base__pixel_buffer* dst, - uint32_t width, - uint32_t height, - const uint8_t* src_ptr0, - const uint8_t* src_ptr1, - const uint8_t* src_ptr2, - uint32_t stride0, - uint32_t stride1, - uint32_t stride2, - uint32_t inv_h0, - uint32_t inv_h1, - uint32_t inv_h2, - uint32_t inv_v0, - uint32_t inv_v1, - uint32_t inv_v2, - uint32_t half_width_for_2to1, - uint32_t half_height_for_2to1, - uint8_t* scratch_buffer_2k_ptr) { - uint32_t y = 0u; - while (true) { - const uint8_t* src_iter0 = src_ptr0; - const uint8_t* src_iter1 = src_ptr1; - const uint8_t* src_iter2 = src_ptr2; - - size_t dst_stride = dst->private_impl.planes[0].stride; - uint8_t* dst_iter = - dst->private_impl.planes[0].ptr + (dst_stride * ((size_t)y)); - - uint32_t x = 0u; - while (true) { - wuffs_base__poke_u32le__no_bounds_check( - dst_iter, wuffs_base__color_ycc__as__color_u32_abgr( - *src_iter0, *src_iter1, *src_iter2)); - dst_iter += 4; - - if ((x + 1u) == width) { - break; - } - x = x + 1u; - src_iter0++; - src_iter1++; - src_iter2++; - } - - if ((y + 1u) == height) { - break; - } - y = y + 1u; - src_ptr0 += stride0; - src_ptr1 += stride1; - src_ptr2 += stride2; - } -} - // -------- // wuffs_base__pixel_swizzler__flattened_length is like