[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/12] vl: drop request_opengl variable
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 10/12] vl: drop request_opengl variable |
Date: |
Tue, 20 Feb 2018 14:47:21 +0100 |
Switch over the one leftover user to qapi DisplayType.
The delete the unused request_opengl variable.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
vl.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/vl.c b/vl.c
index 6271ad0634..11dc98eba2 100644
--- a/vl.c
+++ b/vl.c
@@ -136,7 +136,6 @@ static const char *data_dir[16];
static int data_dir_idx;
const char *bios_name = NULL;
enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
-int request_opengl = -1;
int display_opengl;
const char* keyboard_layout = NULL;
ram_addr_t ram_size;
@@ -2146,10 +2145,8 @@ static LegacyDisplayType select_display(const char *p)
opts = nextopt;
dpy.has_gl = true;
if (strstart(opts, "on", &nextopt)) {
- request_opengl = 1;
dpy.gl = true;
} else if (strstart(opts, "off", &nextopt)) {
- request_opengl = 0;
dpy.gl = false;
} else {
goto invalid_sdl_args;
@@ -2174,7 +2171,6 @@ static LegacyDisplayType select_display(const char *p)
}
} else if (strstart(p, "egl-headless", &opts)) {
#ifdef CONFIG_OPENGL_DMABUF
- request_opengl = 1;
display_opengl = 1;
display = DT_EGL;
dpy.type = DISPLAY_TYPE_EGL_HEADLESS;
@@ -2211,10 +2207,8 @@ static LegacyDisplayType select_display(const char *p)
opts = nextopt;
dpy.has_gl = true;
if (strstart(opts, "on", &nextopt)) {
- request_opengl = 1;
dpy.gl = true;
} else if (strstart(opts, "off", &nextopt)) {
- request_opengl = 0;
dpy.gl = false;
} else {
goto invalid_gtk_args;
@@ -4371,7 +4365,7 @@ int main(int argc, char **argv, char **envp)
qemu_console_early_init();
- if (request_opengl == 1 && display_opengl == 0) {
+ if (dpy.has_gl && dpy.gl && display_opengl == 0) {
#if defined(CONFIG_OPENGL)
error_report("OpenGL is not supported by the display");
#else
--
2.9.3
- [Qemu-devel] [PULL 00/12] Ui 20180220 patches, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 05/12] vl: drop no_quit variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 08/12] cocoa: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 09/12] vl: drop full_screen variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 02/12] vl: rename DisplayType to LegacyDisplayType, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 12/12] ui: Reorder vte terminal packing to avoid gtk3 warnings, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 03/12] gtk: add and use DisplayOptions + DisplayGTK, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 07/12] curses: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 11/12] vl: drop display_type variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 06/12] egl-headless: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 10/12] vl: drop request_opengl variable,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 01/12] vl: deprecate -no-frame, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 04/12] sdl: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- Re: [Qemu-devel] [PULL 00/12] Ui 20180220 patches, Peter Maydell, 2018/02/20