mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

(360 MSVC) Fixes

Browse Source
This commit is contained in:
twinaphex 2015-03-21 22:48:27 +01:00
parent a599b399da
commit 84f9f64f47
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/d3d/d3d.cpp
View File

@ -977,6 +977,11 @@ static bool d3d_init_chain(d3d_video_t *d3d, const video_info_t *video_info)
#endif #endif
(void)i; (void)i;
(void)current_width;
(void)current_height;
(void)out_width;
(void)out_height;
/* Setup information for first pass. */ /* Setup information for first pass. */
#ifdef _XBOX #ifdef _XBOX
/* TODO - properly implement this. */ /* TODO - properly implement this. */

25
menu/drivers/rmenu_xui.cpp
View File

@ -285,12 +285,13 @@ static void* rmenu_xui_init(void)
video_info_t video_info = {0}; video_info_t video_info = {0};
TypefaceDescriptor typeface = {0}; TypefaceDescriptor typeface = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
driver_t *driver = driver_get_ptr();
menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu)); menu_handle_t *menu = (menu_handle_t*)calloc(1, sizeof(*menu));
if (!menu) if (!menu)
return NULL; return NULL;
d3d= (d3d_video_t*)driver.video_data; d3d= (d3d_video_t*)driver->video_data;
if (d3d->resolution_hd_enable) if (d3d->resolution_hd_enable)
RARCH_LOG("HD menus enabled.\n"); RARCH_LOG("HD menus enabled.\n");
@ -313,8 +314,8 @@ static void* rmenu_xui_init(void)
} }
/* Register font */ /* Register font */
typeface.szTypeface = L"Arial Unicode MS"; typeface.szTypeface = L"Arial Unicode MS";
typeface.szLocator = L"file://game:/media/rarch.ttf"; typeface.szLocator = L"file://game:/media/rarch.ttf";
typeface.szReserved1 = NULL; typeface.szReserved1 = NULL;
hr = XuiRegisterTypeface( &typeface, TRUE ); hr = XuiRegisterTypeface( &typeface, TRUE );
@ -350,9 +351,9 @@ static void* rmenu_xui_init(void)
goto error; goto error;
} }
if (driver.video_data && driver.video_poke if (driver->video_data && driver->video_poke
&& driver.video_poke->set_texture_enable) && driver->video_poke->set_texture_enable)
driver.video_poke->set_texture_frame(driver.video_data, NULL, driver->video_poke->set_texture_frame(driver->video_data, NULL,
true, 0, 0, 1.0f); true, 0, 0, 1.0f);
xui_msg_queue = msg_queue_new(16); xui_msg_queue = msg_queue_new(16);
@ -379,7 +380,8 @@ static void xui_render_message(const char *msg)
size_t i = 0; size_t i = 0;
size_t j = 0; size_t j = 0;
struct string_list *list = NULL; struct string_list *list = NULL;
d3d_video_t *d3d = (d3d_video_t*)driver.video_data; driver_t *driver = driver_get_ptr();
d3d_video_t *d3d = (d3d_video_t*)driver->video_data;
if (!d3d) if (!d3d)
return; return;
@ -404,8 +406,8 @@ static void xui_render_message(const char *msg)
font_parms.y = msg_height + (msg_offset * j); font_parms.y = msg_height + (msg_offset * j);
font_parms.scale = 21; font_parms.scale = 21;
if (driver.video_poke && driver.video_poke->set_osd_msg) if (driver->video_poke && driver->video_poke->set_osd_msg)
driver.video_poke->set_osd_msg(driver.video_data, driver->video_poke->set_osd_msg(driver->video_data,
msg, &font_parms, NULL); msg, &font_parms, NULL);
} }
@ -421,12 +423,13 @@ static void rmenu_xui_frame(void)
D3DVIEWPORT vp_full; D3DVIEWPORT vp_full;
LPDIRECT3DDEVICE d3dr; LPDIRECT3DDEVICE d3dr;
d3d_video_t *d3d = NULL; d3d_video_t *d3d = NULL;
menu_handle_t *menu = menu_driver_resolve(); menu_handle_t *menu = menu_driver_resolve();
driver_t *driver = driver_get_ptr();
if (!menu) if (!menu)
return; return;
d3d = (d3d_video_t*)driver.video_data; d3d = (d3d_video_t*)driver->video_data;
if (!d3d) if (!d3d)
return; return;