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.

diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c
index ddd5bed5e982af5ac148668b265f1450b0a94c49..5154aeabb2339e835f1161daac18e7c531110749 100644 (file)
--- 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 37c4cbb77a794c649cab9ec9b7e15cc5eaceb64d..b1c100f6f72c964a3dcc7a373ac0e4bdbdb55a2c 100644 (file)
--- 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 afefe7a018300208c6daf238b24e5a9612e7b1b7..3371bab826dc3244fa594921d2023c1e5d121f9d 100644 (file)
--- a/gsk/gl/gskglrenderjob.c
+++ b/gsk/gl/gskglrenderjob.c
@@ -2996,7 +2996,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;