diff options
| author | Timm Bäder <mail@baedert.org> | 2019-02-14 15:22:40 +0100 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2019-05-22 07:36:28 +0200 |
| commit | 1f5d4171ad063628660e23fcc52804ef95118944 (patch) | |
| tree | 100c3c02a6b15f44d689543f8cd6b814124c6e79 | |
| parent | 27ab1d1826d458d7591fe8910c1e3e213ddea3ad (diff) | |
| download | gtk+-1f5d4171ad063628660e23fcc52804ef95118944.tar.gz | |
glimage: Only support uploading one region
| -rw-r--r-- | gsk/gl/gskglglyphcache.c | 2 | ||||
| -rw-r--r-- | gsk/gl/gskglimage.c | 22 | ||||
| -rw-r--r-- | gsk/gl/gskglimageprivate.h | 5 |
3 files changed, 10 insertions, 19 deletions
diff --git a/gsk/gl/gskglglyphcache.c b/gsk/gl/gskglglyphcache.c index 2e5a737d31..ab1b053390 100644 --- a/gsk/gl/gskglglyphcache.c +++ b/gsk/gl/gskglglyphcache.c @@ -269,7 +269,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 49dd630bde..a4381ae6de 100644 --- a/gsk/gl/gskglimage.c +++ b/gsk/gl/gskglimage.c @@ -43,23 +43,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; - - 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); + 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 |