From 126d6890860e38ae27c25e55a0770f9b5fe37657 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 3 Aug 2024 20:59:40 -0400
Subject: [PATCH] gpu: Rename function

We want to reuse gsk_gpu_color_to_float() for use with GdkColor and this
function will be replaced. But until that's fully done, we need 2
different names.

So rename this one to something else
---
 gsk/gpu/gskgpublurop.c          | 2 +-
 gsk/gpu/gskgpuborderop.c        | 2 +-
 gsk/gpu/gskgpuboxshadowop.c     | 2 +-
 gsk/gpu/gskgpucolorizeop.c      | 2 +-
 gsk/gpu/gskgpucolorop.c         | 2 +-
 gsk/gpu/gskgpurenderpassop.c    | 2 +-
 gsk/gpu/gskgpuroundedcolorop.c  | 2 +-
 gsk/gpu/gskgpushaderopprivate.h | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gsk/gpu/gskgpublurop.c b/gsk/gpu/gskgpublurop.c
index 9a6e1cf0de..76d897f014 100644
--- a/gsk/gpu/gskgpublurop.c
+++ b/gsk/gpu/gskgpublurop.c
@@ -77,7 +77,7 @@ gsk_gpu_blur_op_full (GskGpuFrame             *frame,
   gsk_gpu_rect_to_float (image->coverage, offset, instance->rect);
   gsk_gpu_rect_to_float (image->bounds, offset, instance->tex_rect);
   graphene_vec2_to_float (blur_direction, instance->blur_direction);
-  gsk_gpu_color_to_float (blur_color, instance->blur_color);
+  gsk_gpu_vec4_to_float (blur_color, instance->blur_color);
 }
 
 void
diff --git a/gsk/gpu/gskgpuborderop.c b/gsk/gpu/gskgpuborderop.c
index 01a9f2cc6a..efad9e6989 100644
--- a/gsk/gpu/gskgpuborderop.c
+++ b/gsk/gpu/gskgpuborderop.c
@@ -121,7 +121,7 @@ gsk_gpu_border_op (GskGpuFrame            *frame,
   for (i = 0; i < 4; i++)
     {
       instance->border_widths[i] = widths[i];
-      gsk_gpu_color_to_float (colors[i], &instance->border_colors[4 * i]);
+      gsk_gpu_vec4_to_float (colors[i], &instance->border_colors[4 * i]);
     }
   instance->offset[0] = inside_offset->x;
   instance->offset[1] = inside_offset->y;
diff --git a/gsk/gpu/gskgpuboxshadowop.c b/gsk/gpu/gskgpuboxshadowop.c
index a97c3bdcc0..3b4b87f48b 100644
--- a/gsk/gpu/gskgpuboxshadowop.c
+++ b/gsk/gpu/gskgpuboxshadowop.c
@@ -102,7 +102,7 @@ gsk_gpu_box_shadow_op (GskGpuFrame            *frame,
 
   gsk_gpu_rect_to_float (bounds, offset, instance->bounds);
   gsk_rounded_rect_to_float (outline, offset, instance->outline);
-  gsk_gpu_color_to_float (color, instance->color);
+  gsk_gpu_vec4_to_float (color, instance->color);
   instance->shadow_offset[0] = shadow_offset->x;
   instance->shadow_offset[1] = shadow_offset->y;
   instance->shadow_spread = spread;
diff --git a/gsk/gpu/gskgpucolorizeop.c b/gsk/gpu/gskgpucolorizeop.c
index c73000efb3..4025505cc7 100644
--- a/gsk/gpu/gskgpucolorizeop.c
+++ b/gsk/gpu/gskgpucolorizeop.c
@@ -70,5 +70,5 @@ gsk_gpu_colorize_op (GskGpuFrame             *frame,
 
   gsk_gpu_rect_to_float (image->coverage ? image->coverage : image->bounds, offset, instance->rect);
   gsk_gpu_rect_to_float (image->bounds, offset, instance->tex_rect);
-  gsk_gpu_color_to_float (color, instance->color);
+  gsk_gpu_vec4_to_float (color, instance->color);
 }
diff --git a/gsk/gpu/gskgpucolorop.c b/gsk/gpu/gskgpucolorop.c
index 7ab894b292..9e8dcea329 100644
--- a/gsk/gpu/gskgpucolorop.c
+++ b/gsk/gpu/gskgpucolorop.c
@@ -70,5 +70,5 @@ gsk_gpu_color_op (GskGpuFrame            *frame,
                            &instance);
 
   gsk_gpu_rect_to_float (rect, offset, instance->rect);
-  gsk_gpu_color_to_float (color, instance->color);
+  gsk_gpu_vec4_to_float (color, instance->color);
 }
diff --git a/gsk/gpu/gskgpurenderpassop.c b/gsk/gpu/gskgpurenderpassop.c
index 758b78f7e5..07743961f8 100644
--- a/gsk/gpu/gskgpurenderpassop.c
+++ b/gsk/gpu/gskgpurenderpassop.c
@@ -340,7 +340,7 @@ gsk_gpu_render_pass_begin_op (GskGpuFrame                 *frame,
   self->area = *area;
   self->clear = clear_color_or_null != NULL;
   if (clear_color_or_null)
-    gsk_gpu_color_to_float (clear_color_or_null, self->clear_color);
+    gsk_gpu_vec4_to_float (clear_color_or_null, self->clear_color);
   self->pass_type = pass_type;
 }
 
diff --git a/gsk/gpu/gskgpuroundedcolorop.c b/gsk/gpu/gskgpuroundedcolorop.c
index 46090c2945..40d27b73fa 100644
--- a/gsk/gpu/gskgpuroundedcolorop.c
+++ b/gsk/gpu/gskgpuroundedcolorop.c
@@ -69,6 +69,6 @@ gsk_gpu_rounded_color_op (GskGpuFrame            *frame,
                            &instance);
 
   gsk_rounded_rect_to_float (outline, offset, instance->outline);
-  gsk_gpu_color_to_float (color, instance->color);
+  gsk_gpu_vec4_to_float (color, instance->color);
 }
 
diff --git a/gsk/gpu/gskgpushaderopprivate.h b/gsk/gpu/gskgpushaderopprivate.h
index 87adc73532..94edbd4558 100644
--- a/gsk/gpu/gskgpushaderopprivate.h
+++ b/gsk/gpu/gskgpushaderopprivate.h
@@ -84,8 +84,8 @@ GskGpuOp *              gsk_gpu_shader_op_gl_command                    (GskGpuO
 #define GSK_VEC4_TRANSPARENT (float[4]) { 0.0f, 0.0f, 0.0f, 0.0f }
 
 static inline void
-gsk_gpu_color_to_float (const float color[4],
-                        float       values[4])
+gsk_gpu_vec4_to_float (const float color[4],
+                       float       values[4])
 {
   values[0] = color[0];
   values[1] = color[1];