[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/6] ui/spice: Use HAVE_SPICE_GL for OpenGL checks
From: |
Gerd Hoffmann |
Subject: |
[PULL 2/6] ui/spice: Use HAVE_SPICE_GL for OpenGL checks |
Date: |
Mon, 26 Jul 2021 13:05:40 +0200 |
From: Akihiko Odaki <akihiko.odaki@gmail.com>
Some code in ui/spice used CONFIG_OPENGL for OpenGL conditionals, but
SPICE also depends on CONFIG_GBM and SPICE server whose version is
0.13.1 or later for OpenGL. Always use HAVE_SPICE_GL, which defines the
precise condition.
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20210714055735.86050-1-akihiko.odaki@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/spice-app.c | 3 ++-
ui/spice-core.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ui/spice-app.c b/ui/spice-app.c
index 641f4a9d53e3..7e71e18da9ad 100644
--- a/ui/spice-app.c
+++ b/ui/spice-app.c
@@ -27,6 +27,7 @@
#include <gio/gio.h>
#include "ui/console.h"
+#include "ui/spice-display.h"
#include "qemu/config-file.h"
#include "qemu/option.h"
#include "qemu/cutils.h"
@@ -175,7 +176,7 @@ static void spice_app_display_early_init(DisplayOptions
*opts)
qemu_opt_set(qopts, "addr", sock_path, &error_abort);
qemu_opt_set(qopts, "image-compression", "off", &error_abort);
qemu_opt_set(qopts, "streaming-video", "off", &error_abort);
-#ifdef CONFIG_OPENGL
+#ifdef HAVE_SPICE_GL
qemu_opt_set(qopts, "gl", opts->has_gl ? "on" : "off", &error_abort);
display_opengl = opts->has_gl;
#endif
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 86d43783acac..0371055e6c17 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -1039,6 +1039,6 @@ static void spice_register_config(void)
opts_init(spice_register_config);
module_opts("spice");
-#ifdef CONFIG_OPENGL
+#ifdef HAVE_SPICE_GL
module_dep("ui-opengl");
#endif
--
2.31.1
- [PULL 0/6] Fixes 20210726 patches, Gerd Hoffmann, 2021/07/26
- [PULL 1/6] ui/gtk: Fix relative mouse with multiple monitors, Gerd Hoffmann, 2021/07/26
- [PULL 2/6] ui/spice: Use HAVE_SPICE_GL for OpenGL checks,
Gerd Hoffmann <=
- [PULL 3/6] ui/egl-headless: Remove a check for CONFIG_OPENGL, Gerd Hoffmann, 2021/07/26
- [PULL 4/6] ui/cocoa: Fix the type of main's argv, Gerd Hoffmann, 2021/07/26
- [PULL 6/6] ui/gtk: add a keyboard fifo to the VTE consoles, Gerd Hoffmann, 2021/07/26
- [PULL 5/6] ui: update keycodemapdb submodule commit, Gerd Hoffmann, 2021/07/26
- Re: [PULL 0/6] Fixes 20210726 patches, Peter Maydell, 2021/07/27