From 5de8e9ec6e0aa8a826420087218685c2245a95b5 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 20 Mar 2023 22:02:17 -0400
Subject: [PATCH] gsk: Drop some unused arguments

All callers of the slice apis pass 0 for
min_rows and min_cols. So just drop these.
---
 gsk/gl/gskgldriver.c        | 10 ++++------
 gsk/gl/gskgldriverprivate.h |  9 ++-------
 gsk/gl/gskglrenderjob.c     |  4 ++--
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c
index f4dfdfce8c..a4362c192c 100644
--- a/gsk/gl/gskgldriver.c
+++ b/gsk/gl/gskgldriver.c
@@ -1240,12 +1240,10 @@ void
 gsk_gl_driver_add_texture_slices (GskGLDriver        *self,
                                   GdkTexture         *texture,
                                   gboolean            ensure_mipmap,
-                                  guint               min_cols,
-                                  guint               min_rows,
                                   GskGLTextureSlice **out_slices,
                                   guint              *out_n_slices)
 {
-  int max_texture_size;
+  int max_slice_size;
   GskGLTextureSlice *slices;
   GskGLTexture *t;
   guint n_slices;
@@ -1262,12 +1260,12 @@ gsk_gl_driver_add_texture_slices (GskGLDriver        *self,
   g_assert (out_slices != NULL);
   g_assert (out_n_slices != NULL);
 
-  max_texture_size = self->command_queue->max_texture_size / 2;
+  max_slice_size = self->command_queue->max_texture_size / 2;
   tex_width = texture->width;
   tex_height = texture->height;
 
-  cols = MAX ((texture->width / max_texture_size) + 1, min_cols);
-  rows = MAX ((texture->height / max_texture_size) + 1, min_rows);
+  cols = (texture->width / max_slice_size) + 1;
+  rows = (texture->height / max_slice_size) + 1;
 
   n_slices = cols * rows;
 
diff --git a/gsk/gl/gskgldriverprivate.h b/gsk/gl/gskgldriverprivate.h
index 25f1ff6399..2945aaa4e7 100644
--- a/gsk/gl/gskgldriverprivate.h
+++ b/gsk/gl/gskgldriverprivate.h
@@ -170,8 +170,6 @@ GskGLTexture      * gsk_gl_driver_mark_texture_permanent (GskGLDriver         *s
 void                gsk_gl_driver_add_texture_slices     (GskGLDriver         *self,
                                                           GdkTexture          *texture,
                                                           gboolean             ensure_mipmap,
-                                                          guint                min_cols,
-                                                          guint                min_rows,
                                                           GskGLTextureSlice  **out_slices,
                                                           guint               *out_n_slices);
 GskGLProgram      * gsk_gl_driver_lookup_shader          (GskGLDriver         *self,
@@ -224,8 +222,6 @@ static inline void
 gsk_gl_driver_slice_texture (GskGLDriver        *self,
                              GdkTexture         *texture,
                              gboolean            ensure_mipmap,
-                             guint               min_cols,
-                             guint               min_rows,
                              GskGLTextureSlice **out_slices,
                              guint              *out_n_slices)
 {
@@ -234,15 +230,14 @@ gsk_gl_driver_slice_texture (GskGLDriver        *self,
   t = gdk_texture_get_render_data (texture, self);
 
   if (t && t->slices &&
-      (t->has_mipmap || !ensure_mipmap) &&
-      min_cols == 0 && min_rows == 0)
+      (t->has_mipmap || !ensure_mipmap))
     {
       *out_slices = t->slices;
       *out_n_slices = t->n_slices;
       return;
     }
 
-  gsk_gl_driver_add_texture_slices (self, texture, ensure_mipmap, min_cols, min_rows, out_slices, out_n_slices);
+  gsk_gl_driver_add_texture_slices (self, texture, ensure_mipmap, out_slices, out_n_slices);
 }
 
 G_END_DECLS
diff --git a/gsk/gl/gskglrenderjob.c b/gsk/gl/gskglrenderjob.c
index 3aef417cb0..3fc8958f70 100644
--- a/gsk/gl/gskglrenderjob.c
+++ b/gsk/gl/gskglrenderjob.c
@@ -3573,7 +3573,7 @@ gsk_gl_render_job_visit_texture (GskGLRenderJob        *job,
       GskGLTextureSlice *slices = NULL;
       guint n_slices = 0;
 
-      gsk_gl_driver_slice_texture (job->driver, texture, use_mipmaps, 0, 0, &slices, &n_slices);
+      gsk_gl_driver_slice_texture (job->driver, texture, use_mipmaps, &slices, &n_slices);
 
       g_assert (slices != NULL);
       g_assert (n_slices > 0);
@@ -3720,7 +3720,7 @@ gsk_gl_render_job_visit_texture_scale_node (GskGLRenderJob      *job,
       GskGLTextureSlice *slices = NULL;
       guint n_slices = 0;
 
-      gsk_gl_driver_slice_texture (job->driver, texture, filter == GSK_SCALING_FILTER_TRILINEAR, 0, 0, &slices, &n_slices);
+      gsk_gl_driver_slice_texture (job->driver, texture, filter == GSK_SCALING_FILTER_TRILINEAR, &slices, &n_slices);
 
       gsk_gl_render_job_begin_draw (job, CHOOSE_PROGRAM (job, blit));