diff --git a/gsk/gl/gskglglyphcache.c b/gsk/gl/gskglglyphcache.c index 64e732367e..b9d6d7b6d0 100644 --- a/gsk/gl/gskglglyphcache.c +++ b/gsk/gl/gskglglyphcache.c @@ -277,7 +277,7 @@ upload_dirty_glyph (GskGLGlyphCache *self, if (render_glyph (atlas, (DirtyGlyph *)atlas->user_data, ®ion)) { - gsk_gl_image_upload_regions (&atlas->image, self->gl_driver, 1, ®ion); + gsk_gl_image_upload_region (&atlas->image, self->gl_driver, ®ion); g_free (region.data); } diff --git a/gsk/gl/gskglimage.c b/gsk/gl/gskglimage.c index 0d540b7f78..86e6c0de9d 100644 --- a/gsk/gl/gskglimage.c +++ b/gsk/gl/gskglimage.c @@ -44,23 +44,15 @@ gsk_gl_image_write_to_png (const GskGLImage *self, } void -gsk_gl_image_upload_regions (GskGLImage *self, - GskGLDriver *gl_driver, - guint n_regions, - const GskImageRegion *regions) +gsk_gl_image_upload_region (GskGLImage *self, + GskGLDriver *gl_driver, + const GskImageRegion *region) { - guint i; + gsk_gl_driver_bind_source_texture (gl_driver, self->texture_id); + glBindTexture (GL_TEXTURE_2D, self->texture_id); - for (i = 0; i < n_regions; i ++) - { - const GskImageRegion *region = ®ions[i]; - - gsk_gl_driver_bind_source_texture (gl_driver, self->texture_id); - glBindTexture (GL_TEXTURE_2D, self->texture_id); - - glTexSubImage2D (GL_TEXTURE_2D, 0, region->x, region->y, region->width, region->height, - GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, region->data); - } + glTexSubImage2D (GL_TEXTURE_2D, 0, region->x, region->y, region->width, region->height, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, region->data); #ifdef G_ENABLE_DEBUG /*gsk_gl_driver_bind_source_texture (gl_driver, self->texture_id);*/ diff --git a/gsk/gl/gskglimageprivate.h b/gsk/gl/gskglimageprivate.h index 547f0cb171..d9da860df3 100644 --- a/gsk/gl/gskglimageprivate.h +++ b/gsk/gl/gskglimageprivate.h @@ -30,10 +30,9 @@ void gsk_gl_image_destroy (GskGLImage *self, void gsk_gl_image_write_to_png (const GskGLImage *self, GskGLDriver *gl_driver, const char *filename); -void gsk_gl_image_upload_regions (GskGLImage *self, +void gsk_gl_image_upload_region (GskGLImage *self, GskGLDriver *gl_driver, - guint n_regions, - const GskImageRegion *regions); + const GskImageRegion *region); #endif