CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-24 12:15:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(PS3) Go through get_video_output_size interface now - build fixes

Browse Source
This commit is contained in:
twinaphex 2015-02-24 20:16:03 +01:00
parent 523d9503da
commit 55a2209e8e
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/drivers_context/ps3_ctx.c
View File

@ -227,11 +227,12 @@ static void gfx_ctx_ps3_get_video_size(void *data,
static void gfx_ctx_ps3_get_video_output_size(void *data, static void gfx_ctx_ps3_get_video_output_size(void *data,
unsigned *width, unsigned *height) unsigned *width, unsigned *height)
{ {
unsigned ident = g_extern.console.screen.resolutions.current.id;
if (!width || !height) if (!width || !height)
return; return;
CellVideoOutResolution resolution; CellVideoOutResolution resolution;
cellVideoOutGetResolution(resolution_id, &resolution); cellVideoOutGetResolution(ident, &resolution);
*width = resolution.width; *width = resolution.width;
*height = resolution.height; *height = resolution.height;
@ -270,8 +271,8 @@ static bool gfx_ctx_ps3_init(void *data)
if (g_extern.console.screen.resolutions.current.id) if (g_extern.console.screen.resolutions.current.id)
{ {
params.enable |= PSGL_DEVICE_PARAMETERS_WIDTH_HEIGHT; params.enable |= PSGL_DEVICE_PARAMETERS_WIDTH_HEIGHT;
params.width = gfx_ctx_ps3_get_resolution_width(g_extern.console.screen.resolutions.current.id);
params.height = gfx_ctx_ps3_get_resolution_height(g_extern.console.screen.resolutions.current.id); gfx_ctx_ps3_get_video_output_size(data, &params.width, &params.height);
g_extern.console.screen.pal_enable = false; g_extern.console.screen.pal_enable = false;
if (params.width == 720 && params.height == 576) if (params.width == 720 && params.height == 576)

18
menu/menu_entries_cbs.c
View File

@ -5045,14 +5045,16 @@ static void menu_action_setting_disp_set_label_menu_video_resolution(
menu_gx_resolutions[menu_current_gx_resolution][0], menu_gx_resolutions[menu_current_gx_resolution][0],
menu_gx_resolutions[menu_current_gx_resolution][1], menu_gx_resolutions[menu_current_gx_resolution][1],
menu_gx_resolutions[menu_current_gx_resolution][1] > 300 ? 'i' : 'p'); menu_gx_resolutions[menu_current_gx_resolution][1] > 300 ? 'i' : 'p');
#elif defined(__CELLOS_LV2__) #else
width = gfx_ctx_get_resolution_width( if (driver.video_data && driver.video_poke &&
g_extern.console.screen.resolutions.list driver.video_poke->get_video_output_size)
[g_extern.console.screen.resolutions.current.idx]); {
height = gfx_ctx_get_resolution_height( driver.video_poke->get_video_output_size(driver.video_data,
g_extern.console.screen.resolutions.list &width, &height);
[g_extern.console.screen.resolutions.current.idx]); snprintf(type_str, type_str_size, "%ux%u", width, height);
snprintf(type_str, type_str_size, "%ux%u", width, height); }
else
strlcpy(type_str, "N/A", type_str_size);
#endif #endif
} }