External/libmks
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libmks.git synced 2024-10-01 11:35:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

dmabuf-paintable: code style cleanup

Browse Source
This commit is contained in:
Christian Hergert 2023-06-02 10:19:37 -07:00
parent 0d43432bfa
commit 58d99fb8b1
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/mks-dmabuf-paintable.c
View File

@ -169,12 +169,13 @@ mks_dmabuf_paintable_import (MksDmabufPaintable *self,
cairo_region_t *region, cairo_region_t *region,
GError **error) GError **error)
{ {
g_autoptr(MksDmabufTextureData) texture_data = NULL;
GLuint texture_id;
g_autoptr(GdkGLTextureBuilder) builder = NULL; g_autoptr(GdkGLTextureBuilder) builder = NULL;
g_autoptr(GdkTexture) texture = NULL;
GLuint texture_id;
guint zero = 0; guint zero = 0;
g_return_val_if_fail (MKS_IS_DMABUF_PAINTABLE (self), FALSE); g_return_val_if_fail (MKS_IS_DMABUF_PAINTABLE (self), FALSE);
g_return_val_if_fail (!gl_context || GDK_IS_GL_CONTEXT (gl_context), FALSE);
if (data->dmabuf_fd < 0) if (data->dmabuf_fd < 0)
{ {
@ -203,10 +204,9 @@ mks_dmabuf_paintable_import (MksDmabufPaintable *self,
gdk_paintable_invalidate_size (GDK_PAINTABLE (self)); gdk_paintable_invalidate_size (GDK_PAINTABLE (self));
} }
if (!(texture_id = mks_gl_context_import_dmabuf (gl_context, if (!(texture_id = mks_gl_context_import_dmabuf (gl_context,
data->fourcc, data->width, data->height, data->fourcc, data->width, data->height,
1, &data->dmabuf_fd, &data->stride, &zero, 1, &data->dmabuf_fd, &data->stride, &zero,
&data->modifier))) &data->modifier)))
{ {
g_set_error (error, g_set_error (error,
@ -221,21 +221,20 @@ mks_dmabuf_paintable_import (MksDmabufPaintable *self,
gdk_gl_texture_builder_set_width (builder, self->width); gdk_gl_texture_builder_set_width (builder, self->width);
gdk_gl_texture_builder_set_height (builder, self->height); gdk_gl_texture_builder_set_height (builder, self->height);
gdk_gl_texture_builder_set_context (builder, gl_context); gdk_gl_texture_builder_set_context (builder, gl_context);
if (region) if (region != NULL)
{ {
gdk_gl_texture_builder_set_update_region (builder, region); gdk_gl_texture_builder_set_update_region (builder, region);
gdk_gl_texture_builder_set_update_texture (builder, self->texture); gdk_gl_texture_builder_set_update_texture (builder, self->texture);
} }
texture_data = mks_dmabuf_texture_data_new (gl_context, texture_id); texture = gdk_gl_texture_builder_build (builder,
g_clear_object (&self->texture); (GDestroyNotify)mks_dmabuf_texture_data_unref,
self->texture = gdk_gl_texture_builder_build (builder, mks_dmabuf_texture_data_new (gl_context, texture_id));
(GDestroyNotify) mks_dmabuf_texture_data_unref,
mks_dmabuf_texture_data_ref (texture_data)
);
g_set_object (&self->texture, texture);
gdk_paintable_invalidate_contents (GDK_PAINTABLE (self)); gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
return TRUE; return TRUE;
} }