mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 13:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XDK) Build fix

Browse Source
This commit is contained in:
twinaphex 2014-03-09 18:51:35 +01:00
parent 01f02568b2
commit d1df068583
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/context/d3d_ctx.cpp
View File

@ -208,7 +208,7 @@ void d3d_make_d3dpp(void *data, const video_info_t *info, D3DPRESENT_PARAMETERS
height = 0; height = 0;
if (d3d->ctx_driver && d3d->ctx_driver->get_video_size) if (d3d->ctx_driver && d3d->ctx_driver->get_video_size)
d3d->ctx_driver->get_video_size(&width, &height); d3d->ctx_driver->get_video_size(d3d, &width, &height);
d3dpp->BackBufferWidth = d3d->screen_width = width; d3dpp->BackBufferWidth = d3d->screen_width = width;
d3dpp->BackBufferHeight = d3d->screen_height = height; d3dpp->BackBufferHeight = d3d->screen_height = height;

18
xdk/xdk_d3d.cpp
View File

@ -86,7 +86,7 @@ static void d3d_free(void *data)
d3d->shader = NULL; d3d->shader = NULL;
if (d3d->ctx_driver && d3d->ctx_driver->destroy) if (d3d->ctx_driver && d3d->ctx_driver->destroy)
d3d->ctx_driver->destroy(); d3d->ctx_driver->destroy(d3d);
d3d->ctx_driver = NULL; d3d->ctx_driver = NULL;
free(d3d); free(d3d);
@ -299,7 +299,7 @@ static const gfx_ctx_driver_t *d3d_get_context(void *data)
major = 9; major = 9;
#endif #endif
minor = 0; minor = 0;
return gfx_ctx_init_first(api, major, minor); return gfx_ctx_init_first(d3d, api, major, minor);
} }
static bool d3d_init_base(void *data, const video_info_t *info) static bool d3d_init_base(void *data, const video_info_t *info)
@ -448,7 +448,7 @@ static bool d3d_construct(void *data, const video_info_t *info, const input_driv
unsigned full_x, full_y; unsigned full_x, full_y;
if (d3d->ctx_driver && d3d->ctx_driver->get_video_size) if (d3d->ctx_driver && d3d->ctx_driver->get_video_size)
d3d->ctx_driver->get_video_size(&full_x, &full_y); d3d->ctx_driver->get_video_size(d3d, &full_x, &full_y);
d3d->screen_width = info->fullscreen ? full_x : info->width; d3d->screen_width = info->fullscreen ? full_x : info->width;
d3d->screen_height = info->fullscreen ? full_y : info->height; d3d->screen_height = info->fullscreen ? full_y : info->height;
@ -458,7 +458,7 @@ static bool d3d_construct(void *data, const video_info_t *info, const input_driv
return false; return false;
if (input && input_data) if (input && input_data)
d3d->ctx_driver->input_driver(input, input_data); d3d->ctx_driver->input_driver(d3d, input, input_data);
RARCH_LOG("[D3D]: Init complete.\n"); RARCH_LOG("[D3D]: Init complete.\n");
return true; return true;
@ -789,7 +789,7 @@ static bool d3d_frame(void *data, const void *frame,
#endif #endif
if (d3d && d3d->ctx_driver && d3d->ctx_driver->update_window_title) if (d3d && d3d->ctx_driver && d3d->ctx_driver->update_window_title)
d3d->ctx_driver->update_window_title(); d3d->ctx_driver->update_window_title(d3d);
if (msg) if (msg)
{ {
@ -808,7 +808,7 @@ static bool d3d_frame(void *data, const void *frame,
} }
if (d3d && d3d->ctx_driver && d3d->ctx_driver->swap_buffers) if (d3d && d3d->ctx_driver && d3d->ctx_driver->swap_buffers)
d3d->ctx_driver->swap_buffers(); d3d->ctx_driver->swap_buffers(d3d);
return true; return true;
} }
@ -819,7 +819,7 @@ static void d3d_set_nonblock_state(void *data, bool state)
d3d->video_info.vsync = !state; d3d->video_info.vsync = !state;
if (d3d->ctx_driver && d3d->ctx_driver->swap_interval) if (d3d->ctx_driver && d3d->ctx_driver->swap_interval)
d3d->ctx_driver->swap_interval(state ? 0 : 1); d3d->ctx_driver->swap_interval(d3d, state ? 0 : 1);
} }
static bool d3d_alive(void *data) static bool d3d_alive(void *data)
@ -828,7 +828,7 @@ static bool d3d_alive(void *data)
bool quit, resize; bool quit, resize;
if (d3d->ctx_driver && d3d->ctx_driver->check_window) if (d3d->ctx_driver && d3d->ctx_driver->check_window)
d3d->ctx_driver->check_window(&quit, d3d->ctx_driver->check_window(d3d, &quit,
&resize, NULL, NULL, g_extern.frame_count); &resize, NULL, NULL, g_extern.frame_count);
if (quit) if (quit)
@ -841,7 +841,7 @@ static bool d3d_alive(void *data)
static bool d3d_focus(void *data) static bool d3d_focus(void *data)
{ {
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
return d3d->ctx_driver->has_focus(); return d3d->ctx_driver->has_focus(d3d);
} }
static void d3d_set_aspect_ratio(void *data, unsigned aspect_ratio_idx) static void d3d_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)