diff options
| author | Marc-André Lureau | 2021-02-04 11:52:21 +0100 |
|---|---|---|
| committer | Gerd Hoffmann | 2021-02-04 15:58:54 +0100 |
| commit | 2cc002483e9cc075896912ebc3ebd3fe86660902 (patch) | |
| tree | 7ba03d9403957d0bc50d03e43be0e4cac628b891 | |
| parent | ui: annotate DCLOps callback requirements (diff) | |
| download | qemu-2cc002483e9cc075896912ebc3ebd3fe86660902.tar.gz qemu-2cc002483e9cc075896912ebc3ebd3fe86660902.tar.xz qemu-2cc002483e9cc075896912ebc3ebd3fe86660902.zip | |
ui: remove console_has_gl_dmabuf()
This check is currently limited. It only is used by vhost-user-gpu (not
by vfio-display), and will print an error repeatedly during run-time.
We are going to dissociate the GL context from the
DisplayChangeListener, and listeners may come and go. The following
patches will address this differently.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210204105232.834642-10-marcandre.lureau@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | hw/display/vhost-user-gpu.c | 5 | ||||
| -rw-r--r-- | include/ui/console.h | 1 | ||||
| -rw-r--r-- | ui/console.c | 5 |
3 files changed, 0 insertions, 11 deletions
diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index 55b0ed15f2..dd587436ff 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -224,11 +224,6 @@ vhost_user_gpu_handle_display(VhostUserGPU *g, VhostUserGpuMsg *msg) close(dmabuf->fd); dmabuf->fd = -1; } - if (!console_has_gl_dmabuf(con)) { - /* it would be nice to report that error earlier */ - error_report("console doesn't support dmabuf!"); - break; - } dpy_gl_release_dmabuf(con, dmabuf); if (fd == -1) { dpy_gl_scanout_disable(con); diff --git a/include/ui/console.h b/include/ui/console.h index bea2b6329a..ac989fdf70 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -323,7 +323,6 @@ void dpy_gl_ctx_destroy(QemuConsole *con, QEMUGLContext ctx); int dpy_gl_ctx_make_current(QemuConsole *con, QEMUGLContext ctx); bool console_has_gl(QemuConsole *con); -bool console_has_gl_dmabuf(QemuConsole *con); static inline int surface_stride(DisplaySurface *s) { diff --git a/ui/console.c b/ui/console.c index ab9224429e..b5bc3f7699 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1463,11 +1463,6 @@ bool console_has_gl(QemuConsole *con) return con->gl != NULL; } -bool console_has_gl_dmabuf(QemuConsole *con) -{ - return con->gl != NULL && con->gl->ops->dpy_gl_scanout_dmabuf != NULL; -} - void register_displaychangelistener(DisplayChangeListener *dcl) { static const char nodev[] = |