xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 11:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui/spice: Use HAVE_SPICE_GL for OpenGL checks

Browse Source 
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>
This commit is contained in:
Akihiko Odaki 2021-07-14 14:57:35 +09:00 committed by Gerd Hoffmann
parent cd6c768f6a
commit 9a6c69d389
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/spice-app.c
View File

@ -27,6 +27,7 @@
#include <gio/gio.h> #include <gio/gio.h>
#include "ui/console.h" #include "ui/console.h"
#include "ui/spice-display.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/cutils.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, "addr", sock_path, &error_abort);
qemu_opt_set(qopts, "image-compression", "off", &error_abort); qemu_opt_set(qopts, "image-compression", "off", &error_abort);
qemu_opt_set(qopts, "streaming-video", "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); qemu_opt_set(qopts, "gl", opts->has_gl ? "on" : "off", &error_abort);
display_opengl = opts->has_gl; display_opengl = opts->has_gl;
#endif #endif

2
ui/spice-core.c
View File

@ -1039,6 +1039,6 @@ static void spice_register_config(void)
opts_init(spice_register_config); opts_init(spice_register_config);
module_opts("spice"); module_opts("spice");
#ifdef CONFIG_OPENGL #ifdef HAVE_SPICE_GL
module_dep("ui-opengl"); module_dep("ui-opengl");
#endif #endif