From f5696992211c79f3cee6b5cf4606ccc28b71abdf Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 21 Aug 2023 19:34:47 +1000 Subject: [PATCH] pixconv: rename private etc__convert_func type --- .../cgen/base/pixconv-submodule-x86-avx2.c | 8 +-- internal/cgen/base/pixconv-submodule-ycck.c | 52 ++++++++-------- release/c/wuffs-unsupported-snapshot.c | 60 +++++++++---------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/internal/cgen/base/pixconv-submodule-x86-avx2.c b/internal/cgen/base/pixconv-submodule-x86-avx2.c index a380decf..3402af1d 100644 --- a/internal/cgen/base/pixconv-submodule-x86-avx2.c +++ b/internal/cgen/base/pixconv-submodule-x86-avx2.c @@ -18,7 +18,7 @@ #if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2") static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -27,7 +27,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2( const uint8_t* up1, const uint8_t* up2) { if ((x + 32u) > x_end) { - wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx( // + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx( // dst, x, x_end, y, up0, up1, up2); return; } @@ -291,7 +291,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2( // except for the lines marked with a § and that comments were stripped. WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2") static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -300,7 +300,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2( const uint8_t* up1, const uint8_t* up2) { if ((x + 32u) > x_end) { - wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx( // + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx( // dst, x, x_end, y, up0, up1, up2); return; } diff --git a/internal/cgen/base/pixconv-submodule-ycck.c b/internal/cgen/base/pixconv-submodule-ycck.c index c2425fc0..0b07574d 100644 --- a/internal/cgen/base/pixconv-submodule-ycck.c +++ b/internal/cgen/base/pixconv-submodule-ycck.c @@ -17,7 +17,7 @@ #if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2") static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -28,7 +28,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2( WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2") static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -77,7 +77,7 @@ wuffs_base__u32__min_of_5(uint32_t a, // -------- -typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_func)( +typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func)( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -87,7 +87,7 @@ typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_func)( const uint8_t* up2); static void // -wuffs_base__pixel_swizzler__swizzle_rgb__convert_general( +wuffs_base__pixel_swizzler__swizzle_rgb__convert_3_general( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -105,7 +105,7 @@ wuffs_base__pixel_swizzler__swizzle_rgb__convert_general( } static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_general( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_general( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -122,7 +122,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_general( } static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -144,7 +144,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx( } static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -484,7 +484,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2, - wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) { const uint8_t* src0 = src_ptr0 + ((y / inv_v0) * (size_t)stride0); const uint8_t* src1 = src_ptr1 + ((y / inv_v1) * (size_t)stride1); const uint8_t* src2 = src_ptr2 + ((y / inv_v2) * (size_t)stride2); @@ -537,7 +537,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( first_column, // (total_src_len2 >= half_width_for_2to1)); - (*convfunc)(dst, x, end, y, up0, up1, up2); + (*conv3func)(dst, x, end, y, up0, up1, up2); x = end; } } @@ -563,7 +563,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( uint32_t half_height_for_2to1, uint8_t* scratch_buffer_2k_ptr, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func (*upfuncs)[4][4], - wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) { wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 = (*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u]; wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 = @@ -582,7 +582,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( half_width_for_2to1, // h1v2_bias, // scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2, convfunc); + upfunc0, upfunc1, upfunc2, conv3func); h1v2_bias = 2u; // Middle rows. @@ -651,7 +651,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( first_column, // (total_src_len2 >= half_width_for_2to1)); - (*convfunc)(dst, x, end, y, up0, up1, up2); + (*conv3func)(dst, x, end, y, up0, up1, up2); x = end; } @@ -669,7 +669,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( half_width_for_2to1, // h1v2_bias, // scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2, convfunc); + upfunc0, upfunc1, upfunc2, conv3func); } } @@ -694,7 +694,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( uint32_t half_height_for_2to1, uint8_t* scratch_buffer_2k_ptr, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func (*upfuncs)[4][4], - wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) { wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 = (*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u]; wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 = @@ -740,7 +740,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( src_len2, // 0u, false, false); - (*convfunc)(dst, x, end, y, up0, up1, up2); + (*conv3func)(dst, x, end, y, up0, up1, up2); x = end; } } @@ -896,10 +896,10 @@ wuffs_base__pixel_swizzler__swizzle_ycck( return wuffs_base__make_status(NULL); } - wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc = NULL; + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func = NULL; if (is_rgb_or_cmyk) { - convfunc = &wuffs_base__pixel_swizzler__swizzle_rgb__convert_general; + conv3func = &wuffs_base__pixel_swizzler__swizzle_rgb__convert_3_general; } else { switch (dst->pixcfg.private_impl.pixfmt.repr) { case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: @@ -907,27 +907,27 @@ wuffs_base__pixel_swizzler__swizzle_ycck( case WUFFS_BASE__PIXEL_FORMAT__BGRX: #if defined(WUFFS_BASE__CPU_ARCH__X86_64) if (wuffs_base__cpu_arch__have_x86_avx2()) { - convfunc = - &wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2; + conv3func = + &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2; break; } #endif - convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx; + conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx; break; case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBX: #if defined(WUFFS_BASE__CPU_ARCH__X86_64) if (wuffs_base__cpu_arch__have_x86_avx2()) { - convfunc = - &wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2; + conv3func = + &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2; break; } #endif - convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx; + conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx; break; default: - convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_general; + conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_general; break; } } @@ -952,7 +952,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( uint32_t half_height_for_2to1, // uint8_t* scratch_buffer_2k_ptr, // wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func(*upfuncs)[4][4], - wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) = + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) = &wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter; wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfuncs[4][4]; @@ -1000,7 +1000,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( inv_h0, inv_h1, inv_h2, // inv_v0, inv_v1, inv_v2, // half_width_for_2to1, half_height_for_2to1, // - scratch_buffer_2k.ptr, &upfuncs, convfunc); + scratch_buffer_2k.ptr, &upfuncs, conv3func); return wuffs_base__make_status(NULL); } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index de8bdf22..17888d8a 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -23581,7 +23581,7 @@ wuffs_base__pixel_swizzler__swizzle_interleaved_transparent_black( #if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2") static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -23592,7 +23592,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2( WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2") static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -23641,7 +23641,7 @@ wuffs_base__u32__min_of_5(uint32_t a, // -------- -typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_func)( +typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func)( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -23651,7 +23651,7 @@ typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_func)( const uint8_t* up2); static void // -wuffs_base__pixel_swizzler__swizzle_rgb__convert_general( +wuffs_base__pixel_swizzler__swizzle_rgb__convert_3_general( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -23669,7 +23669,7 @@ wuffs_base__pixel_swizzler__swizzle_rgb__convert_general( } static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_general( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_general( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -23686,7 +23686,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_general( } static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -23708,7 +23708,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx( } static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -24048,7 +24048,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2, - wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) { const uint8_t* src0 = src_ptr0 + ((y / inv_v0) * (size_t)stride0); const uint8_t* src1 = src_ptr1 + ((y / inv_v1) * (size_t)stride1); const uint8_t* src2 = src_ptr2 + ((y / inv_v2) * (size_t)stride2); @@ -24101,7 +24101,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row( first_column, // (total_src_len2 >= half_width_for_2to1)); - (*convfunc)(dst, x, end, y, up0, up1, up2); + (*conv3func)(dst, x, end, y, up0, up1, up2); x = end; } } @@ -24127,7 +24127,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( uint32_t half_height_for_2to1, uint8_t* scratch_buffer_2k_ptr, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func (*upfuncs)[4][4], - wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) { wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 = (*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u]; wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 = @@ -24146,7 +24146,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( half_width_for_2to1, // h1v2_bias, // scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2, convfunc); + upfunc0, upfunc1, upfunc2, conv3func); h1v2_bias = 2u; // Middle rows. @@ -24215,7 +24215,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( first_column, // (total_src_len2 >= half_width_for_2to1)); - (*convfunc)(dst, x, end, y, up0, up1, up2); + (*conv3func)(dst, x, end, y, up0, up1, up2); x = end; } @@ -24233,7 +24233,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter( half_width_for_2to1, // h1v2_bias, // scratch_buffer_2k_ptr, // - upfunc0, upfunc1, upfunc2, convfunc); + upfunc0, upfunc1, upfunc2, conv3func); } } @@ -24258,7 +24258,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( uint32_t half_height_for_2to1, uint8_t* scratch_buffer_2k_ptr, wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func (*upfuncs)[4][4], - wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) { + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) { wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 = (*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u]; wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 = @@ -24304,7 +24304,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter( src_len2, // 0u, false, false); - (*convfunc)(dst, x, end, y, up0, up1, up2); + (*conv3func)(dst, x, end, y, up0, up1, up2); x = end; } } @@ -24460,10 +24460,10 @@ wuffs_base__pixel_swizzler__swizzle_ycck( return wuffs_base__make_status(NULL); } - wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc = NULL; + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func = NULL; if (is_rgb_or_cmyk) { - convfunc = &wuffs_base__pixel_swizzler__swizzle_rgb__convert_general; + conv3func = &wuffs_base__pixel_swizzler__swizzle_rgb__convert_3_general; } else { switch (dst->pixcfg.private_impl.pixfmt.repr) { case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL: @@ -24471,27 +24471,27 @@ wuffs_base__pixel_swizzler__swizzle_ycck( case WUFFS_BASE__PIXEL_FORMAT__BGRX: #if defined(WUFFS_BASE__CPU_ARCH__X86_64) if (wuffs_base__cpu_arch__have_x86_avx2()) { - convfunc = - &wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2; + conv3func = + &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2; break; } #endif - convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx; + conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx; break; case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL: case WUFFS_BASE__PIXEL_FORMAT__RGBX: #if defined(WUFFS_BASE__CPU_ARCH__X86_64) if (wuffs_base__cpu_arch__have_x86_avx2()) { - convfunc = - &wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2; + conv3func = + &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2; break; } #endif - convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx; + conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx; break; default: - convfunc = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_general; + conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_general; break; } } @@ -24516,7 +24516,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( uint32_t half_height_for_2to1, // uint8_t* scratch_buffer_2k_ptr, // wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func(*upfuncs)[4][4], - wuffs_base__pixel_swizzler__swizzle_ycc__convert_func convfunc) = + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) = &wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter; wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfuncs[4][4]; @@ -24564,7 +24564,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( inv_h0, inv_h1, inv_h2, // inv_v0, inv_v1, inv_v2, // half_width_for_2to1, half_height_for_2to1, // - scratch_buffer_2k.ptr, &upfuncs, convfunc); + scratch_buffer_2k.ptr, &upfuncs, conv3func); return wuffs_base__make_status(NULL); } @@ -24575,7 +24575,7 @@ wuffs_base__pixel_swizzler__swizzle_ycck( #if defined(WUFFS_BASE__CPU_ARCH__X86_64) WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2") static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -24584,7 +24584,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2( const uint8_t* up1, const uint8_t* up2) { if ((x + 32u) > x_end) { - wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx( // + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx( // dst, x, x_end, y, up0, up1, up2); return; } @@ -24848,7 +24848,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx_x86_avx2( // except for the lines marked with a § and that comments were stripped. WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2") static void // -wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2( +wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2( wuffs_base__pixel_buffer* dst, uint32_t x, uint32_t x_end, @@ -24857,7 +24857,7 @@ wuffs_base__pixel_swizzler__swizzle_ycc__convert_rgbx_x86_avx2( const uint8_t* up1, const uint8_t* up2) { if ((x + 32u) > x_end) { - wuffs_base__pixel_swizzler__swizzle_ycc__convert_bgrx( // + wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx( // dst, x, x_end, y, up0, up1, up2); return; }