[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 19/20] ui/gtk: Create a common release_dmabuf helper
From: |
Vivek Kasireddy |
Subject: |
[PATCH v3 19/20] ui/gtk: Create a common release_dmabuf helper |
Date: |
Tue, 11 May 2021 01:08:17 -0700 |
Since the texture release mechanism is same for both gtk-egl
and gtk-glarea, move the helper from gtk-egl into common gtk
area so that it can be shared by both gtk backends.
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com>
---
include/ui/gtk.h | 2 --
ui/gtk-egl.c | 8 --------
ui/gtk.c | 11 ++++++++++-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/include/ui/gtk.h b/include/ui/gtk.h
index 0929e658f2..95506aa13b 100644
--- a/include/ui/gtk.h
+++ b/include/ui/gtk.h
@@ -114,8 +114,6 @@ void gd_egl_cursor_dmabuf(DisplayChangeListener *dcl,
uint32_t hot_x, uint32_t hot_y);
void gd_egl_cursor_position(DisplayChangeListener *dcl,
uint32_t pos_x, uint32_t pos_y);
-void gd_egl_release_dmabuf(DisplayChangeListener *dcl,
- QemuDmaBuf *dmabuf);
void gd_egl_flush(DisplayChangeListener *dcl,
uint32_t x, uint32_t y, uint32_t w, uint32_t h);
void gd_egl_scanout_flush(DisplayChangeListener *dcl,
diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
index 799e3cbc78..a5655b6bbc 100644
--- a/ui/gtk-egl.c
+++ b/ui/gtk-egl.c
@@ -255,14 +255,6 @@ void gd_egl_cursor_position(DisplayChangeListener *dcl,
vc->gfx.cursor_y = pos_y * vc->gfx.scale_y;
}
-void gd_egl_release_dmabuf(DisplayChangeListener *dcl,
- QemuDmaBuf *dmabuf)
-{
-#ifdef CONFIG_GBM
- egl_dmabuf_release_texture(dmabuf);
-#endif
-}
-
void gd_egl_scanout_flush(DisplayChangeListener *dcl,
uint32_t x, uint32_t y, uint32_t w, uint32_t h)
{
diff --git a/ui/gtk.c b/ui/gtk.c
index 4c6066b015..621dcf3f9e 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -630,6 +630,14 @@ static bool gd_has_dmabuf(DisplayChangeListener *dcl)
return vc->gfx.has_dmabuf;
}
+static void gd_gl_release_dmabuf(DisplayChangeListener *dcl,
+ QemuDmaBuf *dmabuf)
+{
+#ifdef CONFIG_GBM
+ egl_dmabuf_release_texture(dmabuf);
+#endif
+}
+
static void gd_gl_wait_dmabuf(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf)
{
@@ -661,6 +669,7 @@ static const DisplayChangeListenerOps dcl_gl_area_ops = {
.dpy_gl_scanout_disable = gd_gl_area_scanout_disable,
.dpy_gl_update = gd_gl_area_scanout_flush,
.dpy_gl_scanout_dmabuf = gd_gl_area_scanout_dmabuf,
+ .dpy_gl_release_dmabuf = gd_gl_release_dmabuf,
.dpy_gl_wait_dmabuf = gd_gl_wait_dmabuf,
.dpy_has_dmabuf = gd_has_dmabuf,
};
@@ -684,7 +693,7 @@ static const DisplayChangeListenerOps dcl_egl_ops = {
.dpy_gl_scanout_dmabuf = gd_egl_scanout_dmabuf,
.dpy_gl_cursor_dmabuf = gd_egl_cursor_dmabuf,
.dpy_gl_cursor_position = gd_egl_cursor_position,
- .dpy_gl_release_dmabuf = gd_egl_release_dmabuf,
+ .dpy_gl_release_dmabuf = gd_gl_release_dmabuf,
.dpy_gl_update = gd_egl_flush,
.dpy_gl_wait_dmabuf = gd_gl_wait_dmabuf,
.dpy_has_dmabuf = gd_has_dmabuf,
--
2.30.2
- [PATCH v3 10/20] virtio-gpu: Add helpers to create and destroy dmabuf objects, (continued)
- [PATCH v3 10/20] virtio-gpu: Add helpers to create and destroy dmabuf objects, Vivek Kasireddy, 2021/05/11
- [PATCH v3 12/20] virtio-gpu: Add virtio_gpu_set_scanout_blob, Vivek Kasireddy, 2021/05/11
- [PATCH v3 13/20] virtio-gpu: Update cursor data using blob, Vivek Kasireddy, 2021/05/11
- [PATCH v3 11/20] virtio-gpu: Factor out update scanout, Vivek Kasireddy, 2021/05/11
- [PATCH v3 09/20] ui/pixman: Add qemu_pixman_to_drm_format(), Vivek Kasireddy, 2021/05/11
- [PATCH v3 14/20] virtio-gpu: Add initial definitions for explict flush feature, Vivek Kasireddy, 2021/05/11
- [PATCH v3 15/20] virtio-gpu: Add dmabuf helpers for synchronization, Vivek Kasireddy, 2021/05/11
- [PATCH v3 16/20] virtio-gpu: Add virtio_gpu_wait_flush API, Vivek Kasireddy, 2021/05/11
- [PATCH v3 18/20] ui/gtk-egl: Wait for the draw signal for dmabuf blobs, Vivek Kasireddy, 2021/05/11
- [PATCH v3 17/20] ui: Add egl helpers for synchronization, Vivek Kasireddy, 2021/05/11
- [PATCH v3 19/20] ui/gtk: Create a common release_dmabuf helper,
Vivek Kasireddy <=
- [PATCH v3 20/20] virtio-gpu: Add gl_flushed callback, Vivek Kasireddy, 2021/05/11