[gtk/wip/chergert/glyphy] gsk/gl: rename fields to avoid collision

[Christian Hergert <chergert src gnome org>]

commit 1555d534159c6bae1483cbac008f87795e94c8ae
Author: Christian Hergert <chergert redhat com>
Date:   Wed Mar 16 16:05:25 2022 -0700

    gsk/gl: rename fields to avoid collision
    
    If we have a program named glyphy, it would collide here, so rename it
    to avoid that potential collision.

 gsk/gl/gskgldriver.c        | 17 +++++++++--------
 gsk/gl/gskgldriverprivate.h |  4 ++--
 gsk/gl/gskglrenderjob.c     |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c
index 12be8df515..9ca4a739d8 100644
--- a/gsk/gl/gskgldriver.c
+++ b/gsk/gl/gskgldriver.c
@@ -293,7 +293,8 @@ 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->glyphy_library);
   g_clear_object (&self->icons);
   g_clear_object (&self->shadows);
 
@@ -460,8 +461,8 @@ gsk_gl_driver_new (GskGLCommandQueue  *command_queue,
       return NULL;
     }
 
-  self->glyphs = gsk_gl_glyph_library_new (self);
-  self->glyphy = gsk_gl_glyphy_library_new (self);
+  self->glyphs_library = gsk_gl_glyph_library_new (self);
+  self->glyphy_library = gsk_gl_glyphy_library_new (self);
   self->icons = gsk_gl_icon_library_new (self);
   self->shadows = gsk_gl_shadow_library_new (self);
 
@@ -590,11 +591,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 f277b3f683..3fb469d959 100644
--- a/gsk/gl/gskgldriverprivate.h
+++ b/gsk/gl/gskgldriverprivate.h
@@ -100,8 +100,8 @@ struct _GskGLDriver
   GskGLCommandQueue *shared_command_queue;
   GskGLCommandQueue *command_queue;
 
-  GskGLGlyphLibrary *glyphs;
-  GskGLGlyphyLibrary *glyphy;
+  GskGLGlyphLibrary *glyphs_library;
+  GskGLGlyphyLibrary *glyphy_library;
   GskGLIconLibrary *icons;
   GskGLShadowLibrary *shadows;
 
diff --git a/gsk/gl/gskglrenderjob.c b/gsk/gl/gskglrenderjob.c
index 720592c6fb..cff4327f45 100644
--- a/gsk/gl/gskglrenderjob.c
+++ b/gsk/gl/gskglrenderjob.c
@@ -2997,7 +2997,7 @@ gsk_gl_render_job_visit_text_node_legacy (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;
@@ -3151,7 +3151,7 @@ gsk_gl_render_job_visit_text_node_glyphy (GskGLRenderJob      *job,
 
   font = gsk_text_node_get_font (node);
   glyphs = gsk_text_node_get_glyphs (node, NULL);
-  library = job->driver->glyphy;
+  library = job->driver->glyphy_library;
   offset = gsk_text_node_get_offset (node);
   x = offset->x + job->offset_x;
   y = offset->y + job->offset_y;