[gtk/wip/matthiasc/gl-icon-cache: 7/9] gl: Allow setting min/mag filter on textures

[Matthias Clasen <matthiasc src gnome org>]

commit efd1345ddd346d27f68a1e7d72536cd5a7cc0264
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jun 2 16:47:57 2019 +0000

    gl: Allow setting min/mag filter on textures
    
    This will be used in the future.
    Adapt all callers to pass GL_NEAREST for now.

 gsk/gl/gskgldriver.c        | 7 ++++++-
 gsk/gl/gskgldriverprivate.h | 4 +++-
 gsk/gl/gskglglyphcache.c    | 2 +-
 gsk/gl/gskgliconcache.c     | 4 +++-
 gsk/gl/gskglimage.c         | 6 ++++--
 gsk/gl/gskglimageprivate.h  | 4 +++-
 gsk/gl/gskglrenderer.c      | 6 +++---
 7 files changed, 23 insertions(+), 10 deletions(-)
---
diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c
index a63248ea12..7b3f01b17a 100644
--- a/gsk/gl/gskgldriver.c
+++ b/gsk/gl/gskgldriver.c
@@ -762,7 +762,9 @@ gsk_gl_driver_destroy_texture (GskGLDriver *self,
 
 void
 gsk_gl_driver_init_texture_empty (GskGLDriver *self,
-                                  int          texture_id)
+                                  int          texture_id,
+                                  int          min_filter,
+                                  int          mag_filter)
 {
   Texture *t;
 
@@ -781,6 +783,9 @@ gsk_gl_driver_init_texture_empty (GskGLDriver *self,
       return;
     }
 
+  t->min_filter = min_filter;
+  t->mag_filter = mag_filter;
+
   gsk_gl_driver_set_texture_parameters (self, t->min_filter, t->mag_filter);
 
   if (gdk_gl_context_get_use_es (self->gl_context))
diff --git a/gsk/gl/gskgldriverprivate.h b/gsk/gl/gskgldriverprivate.h
index a3cd675dea..6cddb10202 100644
--- a/gsk/gl/gskgldriverprivate.h
+++ b/gsk/gl/gskgldriverprivate.h
@@ -56,7 +56,9 @@ gboolean        gsk_gl_driver_bind_render_target        (GskGLDriver     *driver
                                                          int              texture_id);
 
 void            gsk_gl_driver_init_texture_empty        (GskGLDriver     *driver,
-                                                         int              texture_id);
+                                                         int              texture_id,
+                                                         int              min_filter,
+                                                         int              max_filter);
 void            gsk_gl_driver_init_texture_with_surface (GskGLDriver     *driver,
                                                          int              texture_id,
                                                          cairo_surface_t *surface,
diff --git a/gsk/gl/gskglglyphcache.c b/gsk/gl/gskglglyphcache.c
index 0b5e5edf2b..2d73cc389a 100644
--- a/gsk/gl/gskglglyphcache.c
+++ b/gsk/gl/gskglglyphcache.c
@@ -356,7 +356,7 @@ gsk_gl_glyph_cache_get_glyph_image (GskGLGlyphCache        *self,
 
   if (atlas->image.texture_id == 0)
     {
-      gsk_gl_image_create (&atlas->image, self->gl_driver, atlas->width, atlas->height);
+      gsk_gl_image_create (&atlas->image, self->gl_driver, atlas->width, atlas->height, GL_NEAREST, 
GL_NEAREST);
       gdk_gl_context_label_object_printf (gsk_gl_driver_get_gl_context (self->gl_driver),
                                           GL_TEXTURE, atlas->image.texture_id,
                                           "Glyph atlas %d", atlas->image.texture_id);
diff --git a/gsk/gl/gskgliconcache.c b/gsk/gl/gskgliconcache.c
index 267ac7c637..424ee9102a 100644
--- a/gsk/gl/gskgliconcache.c
+++ b/gsk/gl/gskgliconcache.c
@@ -2,6 +2,8 @@
 #include "gskgltextureatlasprivate.h"
 #include "gdk/gdktextureprivate.h"
 
+#include <epoxy/gl.h>
+
 #define ATLAS_SIZE    (1024)
 #define MAX_FRAME_AGE (5 * 60)
 #define MAX_UNUSED_RATIO 0.8
@@ -179,7 +181,7 @@ gsk_gl_icon_cache_lookup_or_add (GskGLIconCache  *self,
         /* No atlas has enough space, so create a new one... */
         atlas = g_malloc (sizeof (GskGLTextureAtlas));
         gsk_gl_texture_atlas_init (atlas, ATLAS_SIZE, ATLAS_SIZE);
-        gsk_gl_image_create (&atlas->image, self->gl_driver, atlas->width, atlas->height);
+        gsk_gl_image_create (&atlas->image, self->gl_driver, atlas->width, atlas->height, GL_NEAREST, 
GL_NEAREST);
         /* Pack it onto that one, which surely has enought space... */
         gsk_gl_texture_atlas_pack (atlas, twidth + 2, theight + 2, &packed_x, &packed_y);
         packed_x += 1;
diff --git a/gsk/gl/gskglimage.c b/gsk/gl/gskglimage.c
index a4381ae6de..2d9b85c267 100644
--- a/gsk/gl/gskglimage.c
+++ b/gsk/gl/gskglimage.c
@@ -6,14 +6,16 @@ void
 gsk_gl_image_create (GskGLImage  *self,
                      GskGLDriver *gl_driver,
                      int          width,
-                     int          height)
+                     int          height,
+                     int          min_filter,
+                     int          mag_filter)
 {
   self->texture_id = gsk_gl_driver_create_permanent_texture (gl_driver, width, height);
   self->width = width;
   self->height = height;
 
   gsk_gl_driver_bind_source_texture (gl_driver, self->texture_id);
-  gsk_gl_driver_init_texture_empty (gl_driver, self->texture_id);
+  gsk_gl_driver_init_texture_empty (gl_driver, self->texture_id, min_filter, mag_filter);
 }
 
 void
diff --git a/gsk/gl/gskglimageprivate.h b/gsk/gl/gskglimageprivate.h
index d9da860df3..3d706723b8 100644
--- a/gsk/gl/gskglimageprivate.h
+++ b/gsk/gl/gskglimageprivate.h
@@ -24,7 +24,9 @@ typedef struct
 void gsk_gl_image_create         (GskGLImage           *self,
                                   GskGLDriver          *gl_driver,
                                   int                   width,
-                                  int                   height);
+                                  int                   height,
+                                  int                   min_filter,
+                                  int                   mag_filter);
 void gsk_gl_image_destroy        (GskGLImage           *self,
                                   GskGLDriver          *gl_driver);
 void gsk_gl_image_write_to_png   (const GskGLImage     *self,
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index 4265005e97..3beb8230b6 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -1498,7 +1498,7 @@ render_outset_shadow_node (GskGLRenderer       *self,
 
       texture_id = gsk_gl_driver_create_texture (self->gl_driver, texture_width, texture_height);
       gsk_gl_driver_bind_source_texture (self->gl_driver, texture_id);
-      gsk_gl_driver_init_texture_empty (self->gl_driver, texture_id);
+      gsk_gl_driver_init_texture_empty (self->gl_driver, texture_id, GL_NEAREST, GL_NEAREST);
       gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, texture_id,
                                           "Outset Shadow Temp %d", texture_id);
       render_target = gsk_gl_driver_create_render_target (self->gl_driver, texture_id, FALSE, FALSE);
@@ -1535,7 +1535,7 @@ render_outset_shadow_node (GskGLRenderer       *self,
 
       blurred_texture_id = gsk_gl_driver_create_permanent_texture (self->gl_driver, texture_width, 
texture_height);
       gsk_gl_driver_bind_source_texture (self->gl_driver, blurred_texture_id);
-      gsk_gl_driver_init_texture_empty (self->gl_driver, blurred_texture_id);
+      gsk_gl_driver_init_texture_empty (self->gl_driver, blurred_texture_id, GL_NEAREST, GL_NEAREST);
       gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, blurred_texture_id,
                                           "Outset Shadow Cache %d", blurred_texture_id);
       blurred_render_target = gsk_gl_driver_create_render_target (self->gl_driver, blurred_texture_id, TRUE, 
TRUE);
@@ -2797,7 +2797,7 @@ add_offscreen_ops (GskGLRenderer         *self,
 
   texture_id = gsk_gl_driver_create_texture (self->gl_driver, width, height);
   gsk_gl_driver_bind_source_texture (self->gl_driver, texture_id);
-  gsk_gl_driver_init_texture_empty (self->gl_driver, texture_id);
+  gsk_gl_driver_init_texture_empty (self->gl_driver, texture_id, GL_NEAREST, GL_NEAREST);
   gdk_gl_context_label_object_printf (self->gl_context, GL_TEXTURE, texture_id,
                                       "Offscreen<%s> %d", child_node->node_class->type_name, texture_id);