diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-09-16 13:48:09 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-09-16 13:48:09 +0100 |
| commit | 63cf61256aea21363c2adc18d5b703ed14d85b74 (patch) | |
| tree | b1d835632a8056e7539a0eb84d3e192f2d930099 /include | |
| parent | 57b6f58c1d0df757c9311496c32d502925056894 (diff) | |
| parent | b3a5dfdea99da55fdc70538eeeb2227ebe6d6a5f (diff) | |
| download | qemu-63cf61256aea21363c2adc18d5b703ed14d85b74.zip qemu-63cf61256aea21363c2adc18d5b703ed14d85b74.tar.gz qemu-63cf61256aea21363c2adc18d5b703ed14d85b74.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210916-pull-request' into staging
virtio-gpu + ui: fence syncronization.
qxl: unbreak live migration.
# gpg: Signature made Thu 16 Sep 2021 06:56:03 BST
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20210916-pull-request:
virtio-gpu: Add gl_flushed callback
ui/gtk-egl: Wait for the draw signal for dmabuf blobs
ui: Create sync objects and fences only for blobs
ui/egl: Add egl helpers to help with synchronization
ui/gtk: Create a common release_dmabuf helper
qxl: fix pre-save logic
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 3 | ||||
| -rw-r--r-- | include/ui/egl-helpers.h | 3 | ||||
| -rw-r--r-- | include/ui/gtk.h | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 3be2149..244664d 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -168,6 +168,9 @@ typedef struct QemuDmaBuf { uint64_t modifier; uint32_t texture; bool y0_top; + void *sync; + int fence_fd; + bool allow_fences; } QemuDmaBuf; typedef struct DisplayState DisplayState; diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index f1bf8f9..2fb6e0d 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -19,6 +19,7 @@ typedef struct egl_fb { GLuint texture; GLuint framebuffer; bool delete_texture; + QemuDmaBuf *dmabuf; } egl_fb; void egl_fb_destroy(egl_fb *fb); @@ -45,6 +46,8 @@ int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc, void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf); void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf); +void egl_dmabuf_create_sync(QemuDmaBuf *dmabuf); +void egl_dmabuf_create_fence(QemuDmaBuf *dmabuf); #endif diff --git a/include/ui/gtk.h b/include/ui/gtk.h index 7835ef1..7d22aff 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -155,6 +155,7 @@ extern bool gtk_use_gl_area; /* ui/gtk.c */ void gd_update_windowsize(VirtualConsole *vc); int gd_monitor_update_interval(GtkWidget *widget); +void gd_hw_gl_flushed(void *vc); /* ui/gtk-egl.c */ void gd_egl_init(VirtualConsole *vc); @@ -181,8 +182,8 @@ 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, uint32_t x, uint32_t y, uint32_t w, uint32_t h); void gtk_egl_init(DisplayGLMode mode); |