From 90a278ce46a4c8b54f63f057a8fd744ea5cb8873 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 19 Nov 2023 15:40:55 +0100
Subject: [PATCH] gpu: Rename some descriptors APIs

We want tosupport buffers here, too, so make the names unambiguous.
---
 gsk/gpu/gskgldescriptors.c         | 6 +++---
 gsk/gpu/gskgpudescriptors.c        | 8 ++++----
 gsk/gpu/gskgpudescriptorsprivate.h | 4 ++--
 gsk/gpu/gskgpunodeprocessor.c      | 2 +-
 gsk/gpu/gskvulkandescriptors.c     | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gsk/gpu/gskgldescriptors.c b/gsk/gpu/gskgldescriptors.c
index f55e010dc9..2a6b5b16d3 100644
--- a/gsk/gpu/gskgldescriptors.c
+++ b/gsk/gpu/gskgldescriptors.c
@@ -33,7 +33,7 @@ gsk_gl_descriptors_add_image (GskGpuDescriptors *desc,
   GskGLDescriptors *self = GSK_GL_DESCRIPTORS (desc);
   gsize used_texture_units;
 
-  used_texture_units = gsk_gpu_descriptors_get_size (desc) + 2 * self->n_external;
+  used_texture_units = gsk_gpu_descriptors_get_n_images (desc) + 2 * self->n_external;
 
   if (gsk_gpu_image_get_flags (image) & GSK_GPU_IMAGE_EXTERNAL)
     {
@@ -49,7 +49,7 @@ gsk_gl_descriptors_add_image (GskGpuDescriptors *desc,
       if (used_texture_units >= 16)
         return FALSE;
 
-      *out_descriptor = (gsk_gpu_descriptors_get_size (desc) - self->n_external) << 1;
+      *out_descriptor = (gsk_gpu_descriptors_get_n_images (desc) - self->n_external) << 1;
       return TRUE;
     }
 }
@@ -97,7 +97,7 @@ gsk_gl_descriptors_use (GskGLDescriptors *self)
   n_textures = 16 - 3 * self->n_external;
   ext = 0;
 
-  for (i = 0; i < gsk_gpu_descriptors_get_size (desc); i++)
+  for (i = 0; i < gsk_gpu_descriptors_get_n_images (desc); i++)
     {
       GskGLImage *image = GSK_GL_IMAGE (gsk_gpu_descriptors_get_image (desc, i));
 
diff --git a/gsk/gpu/gskgpudescriptors.c b/gsk/gpu/gskgpudescriptors.c
index 516e57223d..7df79cc723 100644
--- a/gsk/gpu/gskgpudescriptors.c
+++ b/gsk/gpu/gskgpudescriptors.c
@@ -65,7 +65,7 @@ gsk_gpu_descriptors_init (GskGpuDescriptors *self)
 }
 
 gsize
-gsk_gpu_descriptors_get_size (GskGpuDescriptors *self)
+gsk_gpu_descriptors_get_n_images (GskGpuDescriptors *self)
 {
   GskGpuDescriptorsPrivate *priv = gsk_gpu_descriptors_get_instance_private (self);
 
@@ -74,12 +74,12 @@ gsk_gpu_descriptors_get_size (GskGpuDescriptors *self)
 
 void
 gsk_gpu_descriptors_set_size (GskGpuDescriptors *self,
-                              gsize              new_size)
+                              gsize              n_images)
 {
   GskGpuDescriptorsPrivate *priv = gsk_gpu_descriptors_get_instance_private (self);
 
-  g_assert (new_size <= gsk_gpu_image_entries_get_size (&priv->images));
-  gsk_gpu_image_entries_set_size (&priv->images, new_size);
+  g_assert (n_images <= gsk_gpu_image_entries_get_size (&priv->images));
+  gsk_gpu_image_entries_set_size (&priv->images, n_images);
 }
 
 GskGpuImage *
diff --git a/gsk/gpu/gskgpudescriptorsprivate.h b/gsk/gpu/gskgpudescriptorsprivate.h
index 38d2d9809b..c64db7d661 100644
--- a/gsk/gpu/gskgpudescriptorsprivate.h
+++ b/gsk/gpu/gskgpudescriptorsprivate.h
@@ -30,9 +30,9 @@ struct _GskGpuDescriptorsClass
 
 GType                   gsk_gpu_descriptors_get_type                    (void) G_GNUC_CONST;
 
-gsize                   gsk_gpu_descriptors_get_size                    (GskGpuDescriptors      *self);
+gsize                   gsk_gpu_descriptors_get_n_images                (GskGpuDescriptors      *self);
 void                    gsk_gpu_descriptors_set_size                    (GskGpuDescriptors      *self,
-                                                                         gsize                   new_size);
+                                                                         gsize                   n_images);
 GskGpuImage *           gsk_gpu_descriptors_get_image                   (GskGpuDescriptors      *self,
                                                                          gsize                   id);
 GskGpuSampler           gsk_gpu_descriptors_get_sampler                 (GskGpuDescriptors      *self,
diff --git a/gsk/gpu/gskgpunodeprocessor.c b/gsk/gpu/gskgpunodeprocessor.c
index dda86960b5..fda287c107 100644
--- a/gsk/gpu/gskgpunodeprocessor.c
+++ b/gsk/gpu/gskgpunodeprocessor.c
@@ -2731,7 +2731,7 @@ gsk_gpu_node_processor_create_node_pattern (GskGpuPatternWriter *self,
   if (nodes_vtable[node_type].create_pattern != NULL)
     {
       gsize size_before = gsk_gpu_buffer_writer_get_size (&self->writer);
-      gsize images_before = self->desc ? gsk_gpu_descriptors_get_size (self->desc) : 0;
+      gsize images_before = self->desc ? gsk_gpu_descriptors_get_n_images (self->desc) : 0;
       if (nodes_vtable[node_type].create_pattern (self, node))
         return TRUE;
       gsk_gpu_buffer_writer_rewind (&self->writer, size_before);
diff --git a/gsk/gpu/gskvulkandescriptors.c b/gsk/gpu/gskvulkandescriptors.c
index 5c8fec1222..f07b907717 100644
--- a/gsk/gpu/gskvulkandescriptors.c
+++ b/gsk/gpu/gskvulkandescriptors.c
@@ -31,7 +31,7 @@ gsk_vulkan_descriptors_transition (GskVulkanDescriptors *self,
   GskGpuDescriptors *desc = GSK_GPU_DESCRIPTORS (self);
   gsize i;
 
-  for (i = 0; i < gsk_gpu_descriptors_get_size (desc); i++)
+  for (i = 0; i < gsk_gpu_descriptors_get_n_images (desc); i++)
     {
       gsk_vulkan_image_transition (GSK_VULKAN_IMAGE (gsk_gpu_descriptors_get_image (desc, i)),
                                    vk_command_buffer,