OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vl: drop request_opengl variable 

Switch over the one leftover user to qapi DisplayType.
The delete the unused request_opengl variable.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20180202111022.19269-12-kraxel@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2018-02-02 12:10:21 +01:00
parent 6815515ede
commit 9b9b46c71c
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vl.c
View File

@ -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