mirror of
https://github.com/libretro/RetroArch
synced 2024-12-28 18:31:05 +00:00
(Xbox) Added RARCH_CONSOLE functions for null video driver - using null video driver for Xbox 1 for now
This commit is contained in:
parent
15dff68684
commit
ded6f69933
@ -286,14 +286,17 @@ int main(int argc, char *argv[])
|
||||
configure_libretro("game:\\", ".xex");
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_D3D8) || defined(HAVE_D3D9)
|
||||
video_xdk_d3d.start();
|
||||
#else
|
||||
video_null.start();
|
||||
#endif
|
||||
input_xinput.init();
|
||||
|
||||
rarch_input_set_default_keybind_names_for_emulator();
|
||||
|
||||
menu_init();
|
||||
|
||||
|
||||
begin_loop:
|
||||
if(g_console.mode_switch == MODE_EMULATION)
|
||||
{
|
||||
@ -322,9 +325,13 @@ begin_shutdown:
|
||||
rarch_config_save(SYS_CONFIG_FILE);
|
||||
|
||||
menu_free();
|
||||
#if defined(HAVE_D3D8) || defined(HAVE_D3D9)
|
||||
video_xdk_d3d.stop();
|
||||
#else
|
||||
video_null.stop();
|
||||
#endif
|
||||
input_xinput.free(NULL);
|
||||
rarch_exec();
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
@ -78,7 +78,7 @@ enum
|
||||
#define VIDEO_DEFAULT_DRIVER VIDEO_WII
|
||||
#elif defined(XENON)
|
||||
#define VIDEO_DEFAULT_DRIVER VIDEO_XENON360
|
||||
#elif defined(_XBOX1) || defined(_XBOX360)
|
||||
#elif (defined(_XBOX1) || defined(_XBOX360)) && (defined(HAVE_D3D8) || defined(HAVE_D3D9))
|
||||
#define VIDEO_DEFAULT_DRIVER VIDEO_XDK_D3D
|
||||
#elif defined(HAVE_XVIDEO)
|
||||
#define VIDEO_DEFAULT_DRIVER VIDEO_XVIDEO
|
||||
|
@ -98,7 +98,7 @@ VIDEO DRIVER
|
||||
#include "../../wii/video.c"
|
||||
#endif
|
||||
|
||||
#ifdef _XBOX
|
||||
#if defined(_XBOX) && (defined(HAVE_D3D8) || defined(HAVE_D3D9))
|
||||
#include "../../360/xdk_d3d.cpp"
|
||||
#endif
|
||||
|
||||
|
@ -54,7 +54,7 @@
|
||||
XBOX 1 / XBOX 360
|
||||
============================================================ */
|
||||
|
||||
#elif defined(_XBOX)
|
||||
#elif defined(_XBOX) && (defined(HAVE_D3D8) || defined(HAVE_D3D9))
|
||||
|
||||
#define video_init_func(video_info, input, input_data) \
|
||||
xdk_d3d_init(video_info, input, input_data)
|
||||
|
2
driver.c
2
driver.c
@ -85,7 +85,7 @@ static const video_driver_t *video_drivers[] = {
|
||||
#ifdef XENON
|
||||
&video_xenon360,
|
||||
#endif
|
||||
#ifdef _XBOX
|
||||
#if defined(_XBOX) && (defined(HAVE_D3D8) || defined(HAVE_D3D9))
|
||||
&video_xdk_d3d,
|
||||
#endif
|
||||
#ifdef HAVE_SDL
|
||||
|
@ -62,6 +62,10 @@ static void null_gfx_free(void *data)
|
||||
(void)data;
|
||||
}
|
||||
|
||||
static void null_gfx_start(void) {}
|
||||
static void null_gfx_restart(void) {}
|
||||
static void null_gfx_stop(void) {}
|
||||
|
||||
const video_driver_t video_null = {
|
||||
null_gfx_init,
|
||||
null_gfx_frame,
|
||||
@ -71,5 +75,10 @@ const video_driver_t video_null = {
|
||||
NULL,
|
||||
null_gfx_free,
|
||||
"null",
|
||||
#ifdef RARCH_CONSOLE
|
||||
null_gfx_start,
|
||||
null_gfx_stop,
|
||||
null_gfx_restart,
|
||||
#endif
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user