libchafa: Namespace the accelerated cell color/error functions

Author: hpjansson

chafa/chafa-canvas.c

@@ -189,7 +189,7 @@ eval_symbol_colors_wide (ChafaCanvas *canvas, ChafaWorkCell *wcell_a, ChafaWorkC
 }
 
 static gint
-calc_error_plain (const ChafaPixel *block, const ChafaColorPair *color_pair, const guint8 *cov)
+calc_cell_error_plain (const ChafaPixel *block, const ChafaColorPair *color_pair, const guint8 *cov)
 {
     gint error = 0;
     gint i;
@@ -243,15 +243,15 @@ eval_symbol_error (const ChafaWorkCell *wcell,
 
 #ifdef HAVE_AVX2_INTRINSICS
     if (chafa_have_avx2 ())
-        error = calc_error_avx2 (wcell->pixels, &pair, sym->mask_u32);
+        error = chafa_calc_cell_error_avx2 (wcell->pixels, &pair, sym->mask_u32);
     else
 #endif
 #ifdef HAVE_SSE41_INTRINSICS
     if (chafa_have_sse41 ())
-        error = calc_error_sse41 (wcell->pixels, &pair, covp);
+        error = chafa_calc_cell_error_sse41 (wcell->pixels, &pair, covp);
     else
 #endif
-        error = calc_error_plain (wcell->pixels, &pair, covp);
+        error = calc_cell_error_plain (wcell->pixels, &pair, covp);
 
     eval->error = error;
 }

chafa/internal/chafa-avx2.c

@@ -37,8 +37,8 @@
 #endif
 
 gint
-calc_error_avx2 (const ChafaPixel *pixels, const ChafaColorPair *color_pair,
-                 const guint32 *sym_mask_u32)
+chafa_calc_cell_error_avx2 (const ChafaPixel *pixels, const ChafaColorPair *color_pair,
+                            const guint32 *sym_mask_u32)
 {
     __m256i err_8x_u32 = { 0 };
     __m128i err_4x_u32;
@@ -81,8 +81,8 @@ calc_error_avx2 (const ChafaPixel *pixels, const ChafaColorPair *color_pair,
 }
 
 void
-calc_colors_avx2 (const ChafaPixel *pixels, ChafaColorAccum *accums_out,
-                  const guint32 *sym_mask_u32)
+chafa_extract_cell_mean_colors_avx2 (const ChafaPixel *pixels, ChafaColorAccum *accums_out,
+                                     const guint32 *sym_mask_u32)
 {
     const __m128i *pixels_4x_p = (const __m128i *) pixels;
     const __m128i *sym_mask_4x_p = (const __m128i *) sym_mask_u32;

chafa/internal/chafa-mmx.c

@@ -24,7 +24,7 @@
 #include "internal/chafa-private.h"
 
 void
-calc_colors_mmx (const ChafaPixel *pixels, ChafaColorAccum *accums_out, const guint8 *cov)
+chafa_extract_cell_mean_colors_mmx (const ChafaPixel *pixels, ChafaColorAccum *accums_out, const guint8 *cov)
 {
     __m64 accum [2] = { 0 };
     const guint32 *u32p0 = (const guint32 *) pixels;

chafa/internal/chafa-private.h

@@ -207,18 +207,18 @@ gint *chafa_gen_noise_matrix (gdouble magnitude);
 /* Math stuff */
 
 #ifdef HAVE_MMX_INTRINSICS
-void calc_colors_mmx (const ChafaPixel *pixels, ChafaColorAccum *accums_out, const guint8 *cov);
+void chafa_extract_cell_mean_colors_mmx (const ChafaPixel *pixels, ChafaColorAccum *accums_out, const guint8 *cov);
 #endif
 
 #ifdef HAVE_SSE41_INTRINSICS
-gint calc_error_sse41 (const ChafaPixel *pixels, const ChafaColorPair *color_pair, const guint8 *cov) G_GNUC_PURE;
+gint chafa_calc_cell_error_sse41 (const ChafaPixel *pixels, const ChafaColorPair *color_pair, const guint8 *cov);
 #endif
 
 #ifdef HAVE_AVX2_INTRINSICS
-gint calc_error_avx2 (const ChafaPixel *pixels, const ChafaColorPair *color_pair,
-                      const guint32 *sym_mask_u32) G_GNUC_PURE;
-void calc_colors_avx2 (const ChafaPixel *pixels, ChafaColorAccum *accums_out,
-                       const guint32 *sym_mask_u32);
+gint chafa_calc_cell_error_avx2 (const ChafaPixel *pixels, const ChafaColorPair *color_pair,
+                                 const guint32 *sym_mask_u32);
+void chafa_extract_cell_mean_colors_avx2 (const ChafaPixel *pixels, ChafaColorAccum *accums_out,
+                                          const guint32 *sym_mask_u32);
 void chafa_color_accum_div_scalar_avx2 (ChafaColorAccum *accum, guint16 divisor);
 #endif
 

chafa/internal/chafa-sse41.c

@@ -24,7 +24,7 @@
 #include "internal/chafa-private.h"
 
 gint
-calc_error_sse41 (const ChafaPixel *pixels, const ChafaColorPair *color_pair, const guint8 *cov)
+chafa_calc_cell_error_sse41 (const ChafaPixel *pixels, const ChafaColorPair *color_pair, const guint8 *cov)
 {
     const guint32 *u32p0 = (const guint32 *) pixels;
     guint32 cpair_u32 [2];

chafa/internal/chafa-work-cell.c

@@ -57,7 +57,7 @@ fetch_canvas_pixel_block (const ChafaPixel *src_image, gint src_width,
 }
 
 static void
-calc_colors_plain (const ChafaPixel *block, ChafaColorAccum *accums, const guint8 *cov)
+extract_cell_mean_colors_plain (const ChafaPixel *block, ChafaColorAccum *accums, const guint8 *cov)
 {
     const guint8 *in_u8 = (const guint8 *) block;
     gint i;
@@ -82,14 +82,14 @@ chafa_work_cell_get_mean_colors_for_symbol (const ChafaWorkCell *wcell, const Ch
 
 #ifdef HAVE_AVX2_INTRINSICS
     if (chafa_have_avx2 ())
-        calc_colors_avx2 (wcell->pixels, accums, sym->mask_u32);
+        chafa_extract_cell_mean_colors_avx2 (wcell->pixels, accums, sym->mask_u32);
     else
 #elif defined(HAVE_MMX_INTRINSICS)
     if (chafa_have_mmx ())
-        calc_colors_mmx (wcell->pixels, accums, covp);
+        chafa_extract_cell_mean_colors_mmx (wcell->pixels, accums, covp);
     else
 #endif
-        calc_colors_plain (wcell->pixels, accums, covp);
+        extract_cell_mean_colors_plain (wcell->pixels, accums, covp);
 
     if (sym->fg_weight > 1)
         chafa_color_accum_div_scalar (&accums [1], sym->fg_weight);