AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gsk/gl: rename glyphs to glyphs_library

Browse Source 
This naming style is less likely to collide with shader naming and makes
it clear where it is consumed what it is.
This commit is contained in:
Christian Hergert 2022-03-17 16:48:54 -07:00
parent 1b9da2bb17
commit 9d56f44cdf
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gsk/gl/gskgldriver.c
View File

@ -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);

2
gsk/gl/gskgldriverprivate.h
View File

@ -100,7 +100,7 @@ struct _GskGLDriver
GskGLCommandQueue *shared_command_queue;
GskGLCommandQueue *command_queue;
GskGLGlyphLibrary *glyphs;
GskGLGlyphLibrary *glyphs_library;
GskGLIconLibrary *icons;
GskGLShadowLibrary *shadows;

2
gsk/gl/gskglrenderjob.c
View File

@ -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;