diff options
author | Benjamin Otte <otte@redhat.com> | 2023-04-24 22:36:42 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2023-04-27 06:40:47 +0200 |
commit | 76e5fd0ece868d8104bb978fb807ab6ff318fd78 (patch) | |
tree | 2a8a702bb6b1ad0f671e27e785598a4c2a5bbd1d /gsk/gl | |
parent | fa44d258d090cc44bb3fc6f21b4d9f32212ae2b8 (diff) | |
download | gtk+-76e5fd0ece868d8104bb978fb807ab6ff318fd78.tar.gz |
glrenderer: Port to GdkGLTextureBuilder
Diffstat (limited to 'gsk/gl')
-rw-r--r-- | gsk/gl/gskgldriver.c | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/gsk/gl/gskgldriver.c b/gsk/gl/gskgldriver.c index 672f44a5ee..bf54991a34 100644 --- a/gsk/gl/gskgldriver.c +++ b/gsk/gl/gskgldriver.c @@ -1126,14 +1126,20 @@ write_atlas_to_png (GskGLDriver *driver, GskGLTextureAtlas *atlas, const char *filename) { + GdkGLTextureBuilder *builder; GdkTexture *texture; - texture = gdk_gl_texture_new (gsk_gl_driver_get_context (driver), - atlas->texture_id, - atlas->width, atlas->height, - NULL, NULL); + builder = gdk_gl_texture_builder_new (); + gdk_gl_texture_builder_set_context (builder, gsk_gl_driver_get_context (driver)); + gdk_gl_texture_builder_set_id (builder, atlas->texture_id); + gdk_gl_texture_builder_set_width (builder, atlas->width); + gdk_gl_texture_builder_set_height (builder, atlas->height); + + texture = gdk_gl_texture_builder_build (builder, NULL, NULL); gdk_texture_save_to_png (texture, filename); + g_object_unref (texture); + g_object_unref (builder); } void @@ -1578,8 +1584,9 @@ gsk_gl_driver_create_gdk_texture (GskGLDriver *self, guint texture_id) { GskGLTextureState *state; + GdkGLTextureBuilder *builder; GskGLTexture *texture; - int width, height; + GdkTexture *result; g_return_val_if_fail (GSK_IS_GL_DRIVER (self), NULL); g_return_val_if_fail (self->command_queue != NULL, NULL); @@ -1597,16 +1604,19 @@ gsk_gl_driver_create_gdk_texture (GskGLDriver *self, g_hash_table_steal (self->textures, GUINT_TO_POINTER (texture_id)); - width = texture->width; - height = texture->height; + builder = gdk_gl_texture_builder_new (); + gdk_gl_texture_builder_set_context (builder, self->command_queue->context); + gdk_gl_texture_builder_set_id (builder, texture_id); + gdk_gl_texture_builder_set_width (builder, texture->width); + gdk_gl_texture_builder_set_height (builder, texture->height); + + result = gdk_gl_texture_builder_build (builder, + create_texture_from_texture_destroy, + state); texture->texture_id = 0; gsk_gl_texture_free (texture); + g_object_unref (builder); - return gdk_gl_texture_new (self->command_queue->context, - texture_id, - width, - height, - create_texture_from_texture_destroy, - state); + return result; } |