diff options
| author | Timm Bäder <mail@baedert.org> | 2019-07-08 07:14:13 +0000 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2019-07-08 07:14:13 +0000 |
| commit | f286c99338361f028c515890abaab1474364220f (patch) | |
| tree | fe52ea0f24ae610ae11cc55a2015fd1e11645e0d /gsk | |
| parent | ea48d1de5ee44af80c4125b58406ca93dfd4f1ce (diff) | |
| parent | ea6d3f589fc54281e8a514a5c483cb3d49d24a90 (diff) | |
| download | gtk+-f286c99338361f028c515890abaab1474364220f.tar.gz | |
Merge branch 'gltexsubimage2d' into 'master'
use glTexSubImage2D instead of glTextureSubImage2D
Closes #2005
See merge request GNOME/gtk!986
Diffstat (limited to 'gsk')
| -rw-r--r-- | gsk/gl/gskglglyphcache.c | 8 | ||||
| -rw-r--r-- | gsk/gl/gskgliconcache.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gsk/gl/gskglglyphcache.c b/gsk/gl/gskglglyphcache.c index 6d8872a6cd..14ff40e453 100644 --- a/gsk/gl/gskglglyphcache.c +++ b/gsk/gl/gskglglyphcache.c @@ -193,10 +193,10 @@ upload_glyph (GlyphCacheKey *key, if (render_glyph (key, value, &r)) { glBindTexture (GL_TEXTURE_2D, value->texture_id); - glTextureSubImage2D (value->texture_id, 0, - r.x, r.y, r.width, r.height, - GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, - r.data); + glTexSubImage2D (GL_TEXTURE_2D, 0, + r.x, r.y, r.width, r.height, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, + r.data); g_free (r.data); } diff --git a/gsk/gl/gskgliconcache.c b/gsk/gl/gskgliconcache.c index c0ad9af374..2975434dbc 100644 --- a/gsk/gl/gskgliconcache.c +++ b/gsk/gl/gskgliconcache.c @@ -136,7 +136,7 @@ upload_region_or_else (GskGLIconCache *self, GskImageRegion *region) { glBindTexture (GL_TEXTURE_2D, texture_id); - glTextureSubImage2D (texture_id, 0, region->x, region->y, region->width, region->height, + 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); } |