[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/24] vl: drop request_opengl variable
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 13/24] vl: drop request_opengl variable |
Date: |
Fri, 17 Nov 2017 11:30:35 +0100 |
Switch over the one leftover user to qapi DisplayType.
The delete the unused request_opengl variable.
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 36eec0d1e0..c04cef83da 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;
@@ -2170,10 +2169,8 @@ static void parse_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;
@@ -2198,7 +2195,6 @@ static void parse_display(const char *p)
}
} else if (strstart(p, "egl-headless", &opts)) {
#ifdef CONFIG_OPENGL_DMABUF
- request_opengl = 1;
display_opengl = 1;
dpy.type = DISPLAY_TYPE_EGL_HEADLESS;
#else
@@ -2232,10 +2228,8 @@ static void parse_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;
@@ -4462,7 +4456,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] [PATCH 00/24] RfC: rework display initialization, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 08/24] egl-headless: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 11/24] vl: drop full_screen variable, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 04/24] vl: rename DisplayType to LegacyDisplayType, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 13/24] vl: drop request_opengl variable,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 02/24] sdl: remove -alt-grab and -ctrl-grab support, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 03/24] sdl: use ctrl-alt-g as grab hotkey, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 09/24] curses: use DisplayOptions, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 21/24] sdl: build as module, Gerd Hoffmann, 2017/11/17
- [Qemu-devel] [PATCH 19/24] console: add and use qemu_display_find_default, Gerd Hoffmann, 2017/11/17