@@ -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
Switch over the one leftover user to qapi DisplayType. The delete the unused request_opengl variable. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- vl.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)