ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(XDK) Use similar-named context driver as PC D3D

This commit is contained in:
twinaphex 2014-03-07 22:49:44 +01:00
parent ff65d6a58c
commit c5fd281e1c
3 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gfx/context/xdk_ctx.c
View File

@ -139,7 +139,7 @@ void d3d_make_d3dpp(void *data, const video_info_t *info, D3DPRESENT_PARAMETERS
} }
static void gfx_ctx_xdk_set_swap_interval(unsigned interval) static void gfx_ctx_d3d_set_swap_interval(unsigned interval)
{ {
#ifdef _XBOX #ifdef _XBOX
d3d_video_t *d3d = (d3d_video_t*)driver.video_data; d3d_video_t *d3d = (d3d_video_t*)driver.video_data;
@ -152,7 +152,7 @@ static void gfx_ctx_xdk_set_swap_interval(unsigned interval)
#endif #endif
} }
static void gfx_ctx_xdk_check_window(bool *quit, static void gfx_ctx_d3d_check_window(bool *quit,
bool *resize, unsigned *width, unsigned *height, unsigned frame_count) bool *resize, unsigned *width, unsigned *height, unsigned frame_count)
{ {
#ifdef _XBOX #ifdef _XBOX
@ -191,7 +191,7 @@ static void d3d_restore(void)
#endif #endif
} }
static void gfx_ctx_xdk_set_resize(unsigned width, unsigned height) static void gfx_ctx_d3d_set_resize(unsigned width, unsigned height)
{ {
#ifndef _XBOX #ifndef _XBOX
d3d_video_t *d3d = (d3d_video_t*)driver.video_data; d3d_video_t *d3d = (d3d_video_t*)driver.video_data;
@ -211,7 +211,7 @@ static void gfx_ctx_xdk_set_resize(unsigned width, unsigned height)
#endif #endif
} }
static void gfx_ctx_xdk_swap_buffers(void) static void gfx_ctx_d3d_swap_buffers(void)
{ {
d3d_video_t *d3d = (d3d_video_t*)driver.video_data; d3d_video_t *d3d = (d3d_video_t*)driver.video_data;
LPDIRECT3DDEVICE d3dr = d3d->dev; LPDIRECT3DDEVICE d3dr = d3d->dev;
@ -227,7 +227,7 @@ static void gfx_ctx_xdk_swap_buffers(void)
#endif #endif
} }
static bool gfx_ctx_xdk_window_has_focus(void) static bool gfx_ctx_d3d_window_has_focus(void)
{ {
#ifdef _XBOX #ifdef _XBOX
return true; return true;
@ -236,7 +236,7 @@ static bool gfx_ctx_xdk_window_has_focus(void)
#endif #endif
} }
static void gfx_ctx_xdk_update_window_title(void) static void gfx_ctx_d3d_update_window_title(void)
{ {
char buffer[128], buffer_fps[128]; char buffer[128], buffer_fps[128];
bool fps_draw = g_settings.fps_show; bool fps_draw = g_settings.fps_show;
@ -263,7 +263,7 @@ static void gfx_ctx_xdk_update_window_title(void)
} }
} }
static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height) static void gfx_ctx_d3d_get_video_size(unsigned *width, unsigned *height)
{ {
#ifndef _XBOX #ifndef _XBOX
(void)width; (void)width;
@ -360,12 +360,12 @@ static void gfx_ctx_xdk_get_video_size(unsigned *width, unsigned *height)
#endif #endif
} }
static bool gfx_ctx_xdk_init(void) static bool gfx_ctx_d3d_init(void)
{ {
return true; return true;
} }
static void gfx_ctx_xdk_destroy(void) static void gfx_ctx_d3d_destroy(void)
{ {
d3d_video_t * d3d = (d3d_video_t*)driver.video_data; d3d_video_t * d3d = (d3d_video_t*)driver.video_data;
@ -378,7 +378,7 @@ static void gfx_ctx_xdk_destroy(void)
d3d->g_pD3D = 0; d3d->g_pD3D = 0;
} }
static void gfx_ctx_xdk_input_driver(const input_driver_t **input, void **input_data) static void gfx_ctx_d3d_input_driver(const input_driver_t **input, void **input_data)
{ {
#ifdef _XBOX #ifdef _XBOX
void *xinput = input_xinput.init(); void *xinput = input_xinput.init();
@ -387,7 +387,7 @@ static void gfx_ctx_xdk_input_driver(const input_driver_t **input, void **input_
#endif #endif
} }
static bool gfx_ctx_xdk_bind_api(enum gfx_ctx_api api, unsigned major, unsigned minor) static bool gfx_ctx_d3d_bind_api(enum gfx_ctx_api api, unsigned major, unsigned minor)
{ {
(void)major; (void)major;
(void)minor; (void)minor;
@ -399,21 +399,21 @@ static bool gfx_ctx_xdk_bind_api(enum gfx_ctx_api api, unsigned major, unsigned
#endif #endif
} }
const gfx_ctx_driver_t gfx_ctx_xdk = { const gfx_ctx_driver_t gfx_ctx_d3d9 = {
gfx_ctx_xdk_init, gfx_ctx_d3d_init,
gfx_ctx_xdk_destroy, gfx_ctx_d3d_destroy,
gfx_ctx_xdk_bind_api, gfx_ctx_d3d_bind_api,
gfx_ctx_xdk_set_swap_interval, gfx_ctx_d3d_set_swap_interval,
NULL, NULL,
gfx_ctx_xdk_get_video_size, gfx_ctx_d3d_get_video_size,
NULL, NULL,
gfx_ctx_xdk_update_window_title, gfx_ctx_d3d_update_window_title,
gfx_ctx_xdk_check_window, gfx_ctx_d3d_check_window,
gfx_ctx_xdk_set_resize, gfx_ctx_d3d_set_resize,
gfx_ctx_xdk_window_has_focus, gfx_ctx_d3d_window_has_focus,
gfx_ctx_xdk_swap_buffers, gfx_ctx_d3d_swap_buffers,
gfx_ctx_xdk_input_driver, gfx_ctx_d3d_input_driver,
NULL, NULL,
NULL, NULL,
"xdk", "d3d9",
}; };

5
gfx/gfx_context.c
View File

@ -26,10 +26,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
&gfx_ctx_ps3, &gfx_ctx_ps3,
#endif #endif
#if defined(_XBOX) #if defined(HAVE_WIN32_D3D9) || defined(_XBOX)
&gfx_ctx_xdk,
#endif
#if defined(HAVE_WIN32_D3D9)
&gfx_ctx_d3d9, &gfx_ctx_d3d9,
#endif #endif
#if defined(HAVE_VIDEOCORE) #if defined(HAVE_VIDEOCORE)

1
gfx/gfx_context.h
View File

@ -108,7 +108,6 @@ extern const gfx_ctx_driver_t gfx_ctx_d3d9;
extern const gfx_ctx_driver_t gfx_ctx_drm_egl; extern const gfx_ctx_driver_t gfx_ctx_drm_egl;
extern const gfx_ctx_driver_t gfx_ctx_android; extern const gfx_ctx_driver_t gfx_ctx_android;
extern const gfx_ctx_driver_t gfx_ctx_ps3; extern const gfx_ctx_driver_t gfx_ctx_ps3;
extern const gfx_ctx_driver_t gfx_ctx_xdk;
extern const gfx_ctx_driver_t gfx_ctx_wgl; extern const gfx_ctx_driver_t gfx_ctx_wgl;
extern const gfx_ctx_driver_t gfx_ctx_videocore; extern const gfx_ctx_driver_t gfx_ctx_videocore;
extern const gfx_ctx_driver_t gfx_ctx_bbqnx; extern const gfx_ctx_driver_t gfx_ctx_bbqnx;