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

(360) Build fixes

This commit is contained in:
twinaphex 2015-05-09 18:12:15 +02:00
parent 132bec0237
commit 3c5b83cf08
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/d3d/render_chain_xdk.cpp
View File

@ -128,7 +128,7 @@ static bool renderchain_create_first_pass(void *data,
} }
static void renderchain_set_vertices(void *data, unsigned pass, static void renderchain_set_vertices(void *data, unsigned pass,
unsigned width, unsigned height) unsigned width, unsigned height, uint64_t frame_count)
{ {
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
runloop_t *runloop = rarch_main_get_ptr(); runloop_t *runloop = rarch_main_get_ptr();
@ -214,8 +214,7 @@ static void renderchain_set_vertices(void *data, unsigned pass,
if (d3d->shader->set_params) if (d3d->shader->set_params)
d3d->shader->set_params(d3d, width, height, chain->tex_w, d3d->shader->set_params(d3d, width, height, chain->tex_w,
chain->tex_h, global->video_data.width, chain->tex_h, global->video_data.width,
global->video_data.height, runloop->frames.video.count, global->video_data.height, frame_count, NULL, NULL, NULL, 0);
NULL, NULL, NULL, 0);
} }
#endif #endif
#endif #endif
@ -362,9 +361,10 @@ static bool xdk_renderchain_render(void *data, const void *frame,
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
xdk_renderchain_t *chain = (xdk_renderchain_t*)d3d->renderchain_data; xdk_renderchain_t *chain = (xdk_renderchain_t*)d3d->renderchain_data;
uint64_t frame_count = video_driver_get_frame_count();
renderchain_blit_to_texture(chain, frame, width, height, pitch); renderchain_blit_to_texture(chain, frame, width, height, pitch);
renderchain_set_vertices(d3d, 1, width, height); renderchain_set_vertices(d3d, 1, width, height, frame_count);
d3d_set_texture(d3dr, 0, chain->tex); d3d_set_texture(d3dr, 0, chain->tex);
d3d_set_viewport(chain->dev, &d3d->final_viewport); d3d_set_viewport(chain->dev, &d3d->final_viewport);

2
menu/drivers/rmenu_xui.cpp
View File

@ -418,9 +418,9 @@ static void rmenu_xui_frame(void)
XUIMessage msg; XUIMessage msg;
XUIMessageRender msgRender; XUIMessageRender msgRender;
D3DXMATRIX matOrigView; D3DXMATRIX matOrigView;
D3DVIEWPORT vp_full;
LPDIRECT3DDEVICE d3dr; LPDIRECT3DDEVICE d3dr;
const char *message; const char *message;
D3DVIEWPORT vp_full = {0};
d3d_video_t *d3d = NULL; d3d_video_t *d3d = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();

2
tasks/task_file_transfer.c
View File

@ -274,6 +274,7 @@ static int cb_nbio_default(void *data, size_t len)
return 0; return 0;
} }
#ifdef HAVE_RPNG
static int cb_nbio_image_menu_wallpaper(void *data, size_t len) static int cb_nbio_image_menu_wallpaper(void *data, size_t len)
{ {
void *ptr = NULL; void *ptr = NULL;
@ -318,6 +319,7 @@ static int cb_nbio_image_menu_wallpaper(void *data, size_t len)
return 0; return 0;
} }
#endif
static int rarch_main_data_nbio_iterate_poll(nbio_handle_t *nbio) static int rarch_main_data_nbio_iterate_poll(nbio_handle_t *nbio)
{ {