mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sdl: Initialization stubs

Browse Source 
This reduces the number of CONFIG_SDL #ifdefs in vl.c.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Eduardo Habkost 2016-04-19 16:55:20 -03:00
parent 674ec68693
commit 476db0814d
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/ui/console.h
View File

@ -422,8 +422,24 @@ void surface_gl_setup_viewport(ConsoleGLState *gls,
#endif #endif
/* sdl.c */ /* sdl.c */
#ifdef CONFIG_SDL
void sdl_display_early_init(int opengl); void sdl_display_early_init(int opengl);
void sdl_display_init(DisplayState *ds, int full_screen, int no_frame); void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);
#else
static inline void sdl_display_early_init(int opengl)
{
/* This must never be called if CONFIG_SDL is disabled */
error_report("SDL support is disabled");
abort();
}
static inline void sdl_display_init(DisplayState *ds, int full_screen,
int no_frame)
{
/* This must never be called if CONFIG_SDL is disabled */
error_report("SDL support is disabled");
abort();
}
#endif
/* cocoa.m */ /* cocoa.m */
void cocoa_display_init(DisplayState *ds, int full_screen); void cocoa_display_init(DisplayState *ds, int full_screen);

6
vl.c
View File

@ -4251,11 +4251,10 @@ int main(int argc, char **argv, char **envp)
early_gtk_display_init(request_opengl); early_gtk_display_init(request_opengl);
} }
#endif #endif
#if defined(CONFIG_SDL)
if (display_type == DT_SDL) { if (display_type == DT_SDL) {
sdl_display_early_init(request_opengl); sdl_display_early_init(request_opengl);
} }
#endif
if (request_opengl == 1 && display_opengl == 0) { if (request_opengl == 1 && display_opengl == 0) {
#if defined(CONFIG_OPENGL) #if defined(CONFIG_OPENGL)
error_report("OpenGL is not supported by the display"); error_report("OpenGL is not supported by the display");
@ -4543,11 +4542,10 @@ int main(int argc, char **argv, char **envp)
case DT_CURSES: case DT_CURSES:
curses_display_init(ds, full_screen); curses_display_init(ds, full_screen);
break; break;
#if defined(CONFIG_SDL)
case DT_SDL: case DT_SDL:
sdl_display_init(ds, full_screen, no_frame); sdl_display_init(ds, full_screen, no_frame);
break; break;
#elif defined(CONFIG_COCOA) #if defined(CONFIG_COCOA)
case DT_COCOA: case DT_COCOA:
cocoa_display_init(ds, full_screen); cocoa_display_init(ds, full_screen);
break; break;