[gtk/glyphy2: 9/29] gsk/gl: rename glyphs to glyphs_library

[Matthias Clasen <matthiasc src gnome org>]

commit 5e21b906ef0cd34e5a12df6b40bfdeef1ea0d412
Author: Christian Hergert <chergert redhat com>
Date:   Thu Mar 17 16:48:54 2022 -0700

    gsk/gl: rename glyphs to glyphs_library
    
    This naming style is less likely to collide with shader naming and makes
    it clear where it is consumed what it is.

 gsk/gl/gskgldriver.c        | 14 +++++++-------
 gsk/gl/gskgldriverprivate.h |  2 +-
 gsk/gl/gskglrenderjob.c     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c
index ddd5bed5e9..5154aeabb2 100644
--- a/gsk/gl/gskgldriver.c
+++ b/gsk/gl/gskgldriver.c
@@ -292,7 +292,7 @@ gsk_gl_driver_dispose (GObject *object)
   g_assert (!self->texture_id_to_key || g_hash_table_size (self->texture_id_to_key) == 0);
   g_assert (!self->key_to_texture_id|| g_hash_table_size (self->key_to_texture_id) == 0);
 
-  g_clear_object (&self->glyphs);
+  g_clear_object (&self->glyphs_library);
   g_clear_object (&self->icons);
   g_clear_object (&self->shadows);
 
@@ -459,7 +459,7 @@ gsk_gl_driver_new (GskGLCommandQueue  *command_queue,
       return NULL;
     }
 
-  self->glyphs = gsk_gl_glyph_library_new (self);
+  self->glyphs_library = gsk_gl_glyph_library_new (self);
   self->icons = gsk_gl_icon_library_new (self);
   self->shadows = gsk_gl_shadow_library_new (self);
 
@@ -588,11 +588,11 @@ gsk_gl_driver_begin_frame (GskGLDriver       *self,
 
   /* Mark unused pixel regions of the atlases */
   gsk_gl_texture_library_begin_frame (GSK_GL_TEXTURE_LIBRARY (self->icons),
-                                       self->current_frame_id,
-                                       removed);
-  gsk_gl_texture_library_begin_frame (GSK_GL_TEXTURE_LIBRARY (self->glyphs),
-                                       self->current_frame_id,
-                                       removed);
+                                      self->current_frame_id,
+                                      removed);
+  gsk_gl_texture_library_begin_frame (GSK_GL_TEXTURE_LIBRARY (self->glyphs_library),
+                                      self->current_frame_id,
+                                      removed);
 
   /* Cleanup old shadows */
   gsk_gl_shadow_library_begin_frame (self->shadows);
diff --git a/gsk/gl/gskgldriverprivate.h b/gsk/gl/gskgldriverprivate.h
index 37c4cbb77a..b1c100f6f7 100644
--- a/gsk/gl/gskgldriverprivate.h
+++ b/gsk/gl/gskgldriverprivate.h
@@ -100,7 +100,7 @@ struct _GskGLDriver
   GskGLCommandQueue *shared_command_queue;
   GskGLCommandQueue *command_queue;
 
-  GskGLGlyphLibrary *glyphs;
+  GskGLGlyphLibrary *glyphs_library;
   GskGLIconLibrary *icons;
   GskGLShadowLibrary *shadows;
 
diff --git a/gsk/gl/gskglrenderjob.c b/gsk/gl/gskglrenderjob.c
index aa2c0cf26e..3260c92391 100644
--- a/gsk/gl/gskglrenderjob.c
+++ b/gsk/gl/gskglrenderjob.c
@@ -2939,7 +2939,7 @@ gsk_gl_render_job_visit_text_node (GskGLRenderJob      *job,
   guint num_glyphs = gsk_text_node_get_num_glyphs (node);
   float x = offset->x + job->offset_x;
   float y = offset->y + job->offset_y;
-  GskGLGlyphLibrary *library = job->driver->glyphs;
+  GskGLGlyphLibrary *library = job->driver->glyphs_library;
   GskGLCommandBatch *batch;
   int x_position = 0;
   GskGLGlyphKey lookup;