Skip to content

Commit 89faed6

Browse files
vivekkreddykraxel
authored andcommitted
ui/gtk: Create a common release_dmabuf helper
Since the texture release mechanism is same for both gtk-egl and gtk-glarea, move the helper from gtk-egl to common gtk code so that it can be shared by both gtk backends. Cc: Gerd Hoffmann <[email protected]> Reviewed-by: Gerd Hoffmann <[email protected]> Signed-off-by: Vivek Kasireddy <[email protected]> Message-Id: <[email protected]> Signed-off-by: Gerd Hoffmann <[email protected]>
1 parent eb94846 commit 89faed6

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

include/ui/gtk.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,6 @@ void gd_egl_cursor_dmabuf(DisplayChangeListener *dcl,
181181
uint32_t hot_x, uint32_t hot_y);
182182
void gd_egl_cursor_position(DisplayChangeListener *dcl,
183183
uint32_t pos_x, uint32_t pos_y);
184-
void gd_egl_release_dmabuf(DisplayChangeListener *dcl,
185-
QemuDmaBuf *dmabuf);
186184
void gd_egl_scanout_flush(DisplayChangeListener *dcl,
187185
uint32_t x, uint32_t y, uint32_t w, uint32_t h);
188186
void gtk_egl_init(DisplayGLMode mode);

ui/gtk-egl.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,6 @@ void gd_egl_cursor_position(DisplayChangeListener *dcl,
249249
vc->gfx.cursor_y = pos_y * vc->gfx.scale_y;
250250
}
251251

252-
void gd_egl_release_dmabuf(DisplayChangeListener *dcl,
253-
QemuDmaBuf *dmabuf)
254-
{
255-
#ifdef CONFIG_GBM
256-
egl_dmabuf_release_texture(dmabuf);
257-
#endif
258-
}
259-
260252
void gd_egl_scanout_flush(DisplayChangeListener *dcl,
261253
uint32_t x, uint32_t y, uint32_t w, uint32_t h)
262254
{

ui/gtk.c

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,14 @@ static bool gd_has_dmabuf(DisplayChangeListener *dcl)
575575
return vc->gfx.has_dmabuf;
576576
}
577577

578+
static void gd_gl_release_dmabuf(DisplayChangeListener *dcl,
579+
QemuDmaBuf *dmabuf)
580+
{
581+
#ifdef CONFIG_GBM
582+
egl_dmabuf_release_texture(dmabuf);
583+
#endif
584+
}
585+
578586
/** DisplayState Callbacks (opengl version) **/
579587

580588
static const DisplayChangeListenerOps dcl_gl_area_ops = {
@@ -593,6 +601,7 @@ static const DisplayChangeListenerOps dcl_gl_area_ops = {
593601
.dpy_gl_scanout_disable = gd_gl_area_scanout_disable,
594602
.dpy_gl_update = gd_gl_area_scanout_flush,
595603
.dpy_gl_scanout_dmabuf = gd_gl_area_scanout_dmabuf,
604+
.dpy_gl_release_dmabuf = gd_gl_release_dmabuf,
596605
.dpy_has_dmabuf = gd_has_dmabuf,
597606
};
598607

@@ -615,8 +624,8 @@ static const DisplayChangeListenerOps dcl_egl_ops = {
615624
.dpy_gl_scanout_dmabuf = gd_egl_scanout_dmabuf,
616625
.dpy_gl_cursor_dmabuf = gd_egl_cursor_dmabuf,
617626
.dpy_gl_cursor_position = gd_egl_cursor_position,
618-
.dpy_gl_release_dmabuf = gd_egl_release_dmabuf,
619627
.dpy_gl_update = gd_egl_scanout_flush,
628+
.dpy_gl_release_dmabuf = gd_gl_release_dmabuf,
620629
.dpy_has_dmabuf = gd_has_dmabuf,
621630
};
622631

0 commit comments

Comments
 (0)