From 2f8c4c10a9d60f46c55142df768531b357d30f84 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 30 May 2012 01:19:25 +0200 Subject: [PATCH 1/2] (PS3) Fix reentrant ROM loading - input wasn't being brought up again after deiniting input - will just comment out cellPadEnd for now --- ps3/ps3_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c index f92dd7fd8d..546d8c7312 100644 --- a/ps3/ps3_input.c +++ b/ps3/ps3_input.c @@ -244,7 +244,7 @@ void oskutil_unload(oskutil_params *params) static void ps3_free_input(void *data) { (void)data; - cellPadEnd(); + //cellPadEnd(); } static void* ps3_input_initialize(void) From 3fd10a723daf95c1e01c0831ad03d4d81fc79ca1 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 30 May 2012 16:30:25 +0200 Subject: [PATCH 2/2] (PS3) Cleanups --- Makefile.ps3 | 2 +- console/console_ext.h | 33 +++++++++++++++++++++ console/libretro_mgmt.h | 8 +++++ gfx/context/ps3_ctx.c | 2 +- gfx/context/xdk360_ctx.c | 4 +++ gfx/gfx_context.h | 1 + ps3/main.c | 13 +++++++-- ps3/menu.c | 63 +++++++++++++++++++++------------------- ps3/ps3_video_psgl.h | 1 - ps3/shared.h | 27 ----------------- 10 files changed, 92 insertions(+), 62 deletions(-) diff --git a/Makefile.ps3 b/Makefile.ps3 index 7ea9033349..f42249d76b 100644 --- a/Makefile.ps3 +++ b/Makefile.ps3 @@ -68,7 +68,7 @@ endif PPU_LDLIBS = -ldbgfont $(GL_LIBS) -lretro -lcgc -lgcm_cmd -lgcm_sys_stub -lresc_stub -lm -lio_stub -lfs_stub -lsysutil_stub -lsysutil_game_stub -lsysutil_screenshot_stub -lsysutil_np_stub -lpngdec_stub -ljpgdec_stub -lsysmodule_stub -laudio_stub -lnet_stub -lnetctl_stub -lpthread -DEFINES += -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OPENGL_TEXREF -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_CG -DHAVE_CG_MENU -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_GRIFFIN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) +DEFINES += -DRARCH_CONSOLE -DHAVE_OPENGL -DHAVE_OPENGL_TEXREF -DHAVE_HEADSET -DHAVE_VID_CONTEXT -DHAVE_OPENGLES -DHAVE_CG -DHAVE_CG_MENU -DHAVE_FILEBROWSER -DHAVE_FBO -DHAVE_RARCH_MAIN_WRAP -DHAVE_SYSMODULES -DHAVE_SYSUTILS -DHAVE_RARCH_EXEC -DHAVE_RGL -DHAVE_LIBRETRO_MANAGEMENT -DHAVE_RSOUND -DHAVE_ZLIB -D__CELLOS_LV2__ -DHAVE_CONFIGFILE=1 -DHAVE_NETPLAY=1 -DHAVE_SOCKET_LEGACY=1 -DHAVE_GRIFFIN=1 -DHAVE_MULTIMAN=1 -DPACKAGE_VERSION=\"$(RARCH_VERSION)\" -Dmain=rarch_main -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) ifeq ($(DEBUG), 1) PPU_OPTIMIZE_LV := -O0 -g diff --git a/console/console_ext.h b/console/console_ext.h index c192ab9b6b..299c8f33e8 100644 --- a/console/console_ext.h +++ b/console/console_ext.h @@ -27,6 +27,10 @@ #define IS_TIMER_EXPIRED(handle) (!(IS_TIMER_NOT_EXPIRED(handle))) #define SET_TIMER_EXPIRATION(handle, value) (g_console.timer_expiration_frame_count = handle->frame_count + value) +/*============================================================ + VIDEO +============================================================ */ + enum aspect_ratio { ASPECT_RATIO_1_1 = 0, @@ -69,6 +73,20 @@ enum rotation extern char rotation_lut[ASPECT_RATIO_END][PATH_MAX]; +/* ABGR color format defines */ + +#define WHITE 0xffffffffu +#define RED 0xff0000ffu +#define GREEN 0xff00ff00u +#define BLUE 0xffff0000u +#define YELLOW 0xff00ffffu +#define PURPLE 0xffff00ffu +#define CYAN 0xffffff00u +#define ORANGE 0xff0063ffu +#define SILVER 0xff8c848cu +#define LIGHTBLUE 0xFFFFE0E0U +#define LIGHTORANGE 0xFFE0EEFFu + struct aspect_ratio_elem { char name[64]; @@ -81,6 +99,21 @@ extern void rarch_set_auto_viewport(unsigned width, unsigned height); #include "console_ext_input.h" +/*============================================================ + SOUND +============================================================ */ + +enum +{ + SOUND_MODE_NORMAL, +#ifdef HAVE_RSOUND + SOUND_MODE_RSOUND, +#endif +#ifdef HAVE_HEADSET + SOUND_MODE_HEADSET, +#endif +}; + /*============================================================ ROM EXTENSIONS ============================================================ */ diff --git a/console/libretro_mgmt.h b/console/libretro_mgmt.h index 4202441ce5..b32db42850 100644 --- a/console/libretro_mgmt.h +++ b/console/libretro_mgmt.h @@ -19,6 +19,14 @@ #include "../boolean.h" +enum +{ + EXTERN_LAUNCHER_SALAMANDER, +#ifdef HAVE_MULTIMAN + EXTERN_LAUNCHER_MULTIMAN +#endif +}; + const char *rarch_manage_libretro_install(const char *full_path, const char *path, const char *exe_ext); const char *rarch_manage_libretro_set_first_file(const char *libretro_path, const char * exe_ext); diff --git a/gfx/context/ps3_ctx.c b/gfx/context/ps3_ctx.c index 0822cbc4ee..9ceb59059b 100644 --- a/gfx/context/ps3_ctx.c +++ b/gfx/context/ps3_ctx.c @@ -324,7 +324,7 @@ void ps3_previous_resolution (void) } } -int ps3_check_resolution(uint32_t resolution_id) +int gfx_ctx_check_resolution(unsigned resolution_id) { return cellVideoOutGetResolutionAvailability(CELL_VIDEO_OUT_PRIMARY, resolution_id, CELL_VIDEO_OUT_ASPECT_AUTO, 0); } diff --git a/gfx/context/xdk360_ctx.c b/gfx/context/xdk360_ctx.c index 31d7453d40..0d4bbc4241 100644 --- a/gfx/context/xdk360_ctx.c +++ b/gfx/context/xdk360_ctx.c @@ -133,3 +133,7 @@ void gfx_ctx_set_overscan(void) d3d9->should_resize = true; } +int gfx_ctx_check_resolution(unsigned resolution_id) +{ + return 0; +} diff --git a/gfx/gfx_context.h b/gfx/gfx_context.h index cd1ba4cb52..a72fa0e6c2 100644 --- a/gfx/gfx_context.h +++ b/gfx/gfx_context.h @@ -75,6 +75,7 @@ bool gfx_ctx_menu_init(void); #ifdef RARCH_CONSOLE void gfx_ctx_set_filtering(unsigned index, bool set_smooth); void gfx_ctx_get_available_resolutions(void); +int gfx_ctx_check_resolution(unsigned resolution_id); #endif #if defined(HAVE_OPENGL) || defined(HAVE_D3D9) diff --git a/ps3/main.c b/ps3/main.c index b289707017..9a5fb096d6 100644 --- a/ps3/main.c +++ b/ps3/main.c @@ -73,7 +73,9 @@ char DEFAULT_SHADER_FILE[PATH_MAX]; char DEFAULT_MENU_SHADER_FILE[PATH_MAX]; char SYS_CONFIG_FILE[PATH_MAX]; char EMULATOR_CORE_SELF[PATH_MAX]; +#ifdef HAVE_MULTIMAN char MULTIMAN_EXECUTABLE[PATH_MAX]; +#endif int rarch_main(int argc, char *argv[]); @@ -197,6 +199,7 @@ static void get_environment_settings(int argc, char *argv[]) RARCH_ERR("System cache partition could not be mounted, it might be already mounted.\n"); } +#ifdef HAVE_MULTIMAN if(argc > 1) { /* launched from external launcher */ @@ -215,6 +218,7 @@ static void get_environment_settings(int argc, char *argv[]) RARCH_LOG("Started from multiMAN, auto-game start enabled.\n"); } else +#endif { g_console.external_launcher_support = EXTERN_LAUNCHER_SALAMANDER; RARCH_WARN("Not started from multiMAN, auto-game start disabled.\n"); @@ -248,11 +252,13 @@ static void get_environment_settings(int argc, char *argv[]) ret = cellGameContentPermit(contentInfoPath, usrDirPath); +#ifdef HAVE_MULTIMAN if(g_console.external_launcher_support == EXTERN_LAUNCHER_MULTIMAN) { snprintf(contentInfoPath, sizeof(contentInfoPath), "/dev_hdd0/game/%s", EMULATOR_CONTENT_DIR); snprintf(usrDirPath, sizeof(usrDirPath), "/dev_hdd0/game/%s/USRDIR", EMULATOR_CONTENT_DIR); } +#endif if(ret < 0) { @@ -370,13 +376,16 @@ int main(int argc, char *argv[]) case EXTERN_LAUNCHER_SALAMANDER: g_console.mode_switch = MODE_MENU; break; +#ifdef HAVE_MULTIMAN case EXTERN_LAUNCHER_MULTIMAN: RARCH_LOG("Started from multiMAN, will auto-start game.\n"); strlcpy(g_console.rom_path, argv[1], sizeof(g_console.rom_path)); - g_console.initialize_rarch_enable = 1; - g_console.mode_switch = MODE_EMULATION; + rarch_settings_change(S_START_RARCH); rarch_startup(SYS_CONFIG_FILE); break; +#endif + default: + break; } begin_loop: diff --git a/ps3/menu.c b/ps3/menu.c index edfb2160b2..c1704387f3 100644 --- a/ps3/menu.c +++ b/ps3/menu.c @@ -48,7 +48,6 @@ int menuStackindex = 0; static bool set_initial_dir_tmpbrowser; static bool set_libretro_core_as_launch; -char special_action_msg[256]; /* message which should be overlaid on top of the screen */ filebrowser_t browser; /* main file browser->for rom browser*/ filebrowser_t tmpBrowser; /* tmp file browser->for everything else*/ uint32_t set_shader = 0; @@ -151,6 +150,8 @@ static menu menu_controlssettings = { static void display_menubar(uint32_t menu_enum) { + gl_t *gl = driver.video_data; + cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, menu_enum == GENERAL_VIDEO_MENU ? RED : GREEN, menu_generalvideosettings.title); cellDbgFontPuts (0.19f, 0.05f, FONT_SIZE, menu_enum == GENERAL_AUDIO_MENU ? RED : GREEN, menu_generalaudiosettings.title); cellDbgFontPuts (0.29f, 0.05f, FONT_SIZE, menu_enum == EMU_GENERAL_MENU ? RED : GREEN, menu_emu_settings.title); @@ -159,7 +160,7 @@ static void display_menubar(uint32_t menu_enum) cellDbgFontPuts (0.09f, 0.09f, FONT_SIZE, menu_enum == PATH_MENU ? RED : GREEN, menu_pathsettings.title); cellDbgFontPuts (0.19f, 0.09f, FONT_SIZE, menu_enum == CONTROLS_MENU ? RED : GREEN, menu_controlssettings.title); cellDbgFontPrintf (0.8f, 0.09f, 0.82f, WHITE, "v%s", EMULATOR_VERSION); - cellDbgFontDraw(); + gl_render_msg_post(gl); } enum @@ -199,7 +200,6 @@ static void set_delay_speed(unsigned delaymode) break; } - strlcpy(special_action_msg, "", sizeof(special_action_msg)); SET_TIMER_EXPIRATION(gl, speed); } @@ -327,6 +327,7 @@ static void browser_update(filebrowser_t * b) static void browser_render(filebrowser_t * b) { + gl_t *gl = driver.video_data; uint32_t file_count = b->file_count; int current_index, page_number, page_base, i; float currentX, currentY, ySpacing; @@ -343,9 +344,9 @@ static void browser_render(filebrowser_t * b) { currentY = currentY + ySpacing; cellDbgFontPuts(currentX, currentY, FONT_SIZE, i == current_index ? RED : b->cur[i].d_type == CELL_FS_TYPE_DIRECTORY ? GREEN : WHITE, b->cur[i].d_name); - cellDbgFontDraw(); + gl_render_msg_post(gl); } - cellDbgFontDraw(); + gl_render_msg_post(gl); } static void set_setting_label(menu * menu_obj, uint64_t currentsetting) @@ -951,7 +952,7 @@ static void select_file(uint32_t menu_id) cellDbgFontPuts (0.09f, 0.05f, FONT_SIZE, RED, title); cellDbgFontPrintf(0.09f, 0.92f, 0.92, YELLOW, "X - Select %s /\\ - return to settings START - Reset Startdir", object); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "%s", comment); - cellDbgFontDraw(); + gl_render_msg_post(gl); browser_render(&tmpBrowser); old_state = state; @@ -1051,7 +1052,7 @@ static void select_directory(uint32_t menu_id) "X - Enter dir /\\ - return to settings START - Reset Startdir"); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, "%s", "INFO - Browse to a directory and assign it as the path by\npressing SQUARE button."); - cellDbgFontDraw(); + gl_render_msg_post(gl); browser_render(&tmpBrowser); old_state = state; @@ -1180,7 +1181,7 @@ static void producesettingentry(menu * menu_obj, uint64_t switchvalue) { if (g_console.supported_resolutions[g_console.current_resolution_index] == CELL_VIDEO_OUT_RESOLUTION_576) { - if(ps3_check_resolution(CELL_VIDEO_OUT_RESOLUTION_576)) + if(gfx_ctx_check_resolution(CELL_VIDEO_OUT_RESOLUTION_576)) { //ps3graphics_set_pal60hz(Settings.PS3PALTemporalMode60Hz); video_gl.restart(); @@ -1870,7 +1871,7 @@ static void select_setting(menu * menu_obj) } display_menubar(menu_obj->enum_id); - cellDbgFontDraw(); + gl_render_msg_post(gl); for ( i = menu_obj->first_setting; i < menu_obj->max_settings; i++) { @@ -1878,7 +1879,7 @@ static void select_setting(menu * menu_obj) { cellDbgFontPuts(menu_obj->items[i].text_xpos, menu_obj->items[i].text_ypos, FONT_SIZE, menu_obj->selected == menu_obj->items[i].enum_id ? YELLOW : menu_obj->items[i].item_color, menu_obj->items[i].text); cellDbgFontPuts(0.5f, menu_obj->items[i].text_ypos, FONT_SIZE, menu_obj->items[i].text_color, menu_obj->items[i].setting_text); - cellDbgFontDraw(); + gl_render_msg_post(gl); } } @@ -1886,7 +1887,7 @@ static void select_setting(menu * menu_obj) cellDbgFontPuts(0.09f, 0.91f, FONT_SIZE, YELLOW, "UP/DOWN - select L3+R3 - resume game X/LEFT/RIGHT - change"); cellDbgFontPuts(0.09f, 0.95f, FONT_SIZE, YELLOW, "START - default L1/CIRCLE - go back R1 - go forward"); - cellDbgFontDraw(); + gl_render_msg_post(gl); old_state = state; } @@ -1973,7 +1974,7 @@ static void select_rom(void) "PATH: %s", FILEBROWSER_GET_CURRENT_DIRECTORY_NAME(browser)); cellDbgFontPuts (0.09f, 0.93f, FONT_SIZE, YELLOW, "L3 + R3 - resume game SELECT - Settings screen"); - cellDbgFontDraw(); + gl_render_msg_post(gl); browser_render(&browser); old_state = state; @@ -2235,7 +2236,7 @@ static void ingame_menu(uint32_t menu_id) cellDbgFontPrintf (0.09f, 0.46f, font_size, LIGHTBLUE, "LEFT or LSTICK UP"); cellDbgFontPrintf (0.5f, 0.46f, font_size, LIGHTBLUE, "- Decrease Viewport X"); - cellDbgFontDraw(); + gl_render_msg_post(gl); cellDbgFontPrintf (0.09f, 0.48f, font_size, LIGHTBLUE, "RIGHT or LSTICK RIGHT"); cellDbgFontPrintf (0.5f, 0.48f, font_size, LIGHTBLUE, "- Increase Viewport X"); @@ -2243,7 +2244,7 @@ static void ingame_menu(uint32_t menu_id) cellDbgFontPrintf (0.09f, 0.50f, font_size, LIGHTBLUE, "UP or LSTICK UP"); cellDbgFontPrintf (0.5f, 0.50f, font_size, LIGHTBLUE, "- Increase Viewport Y"); - cellDbgFontDraw(); + gl_render_msg_post(gl); cellDbgFontPrintf (0.09f, 0.52f, font_size, LIGHTBLUE, "DOWN or LSTICK DOWN"); cellDbgFontPrintf (0.5f, 0.52f, font_size, LIGHTBLUE, "- Decrease Viewport Y"); @@ -2251,7 +2252,7 @@ static void ingame_menu(uint32_t menu_id) cellDbgFontPrintf (0.09f, 0.54f, font_size, LIGHTBLUE, "L1 or RSTICK LEFT"); cellDbgFontPrintf (0.5f, 0.54f, font_size, LIGHTBLUE, "- Decrease Viewport Width"); - cellDbgFontDraw(); + gl_render_msg_post(gl); cellDbgFontPrintf (0.09f, 0.56f, font_size, LIGHTBLUE, "R1 or RSTICK RIGHT"); cellDbgFontPrintf (0.5f, 0.56f, font_size, LIGHTBLUE, "- Increase Viewport Width"); @@ -2259,7 +2260,7 @@ static void ingame_menu(uint32_t menu_id) cellDbgFontPrintf (0.09f, 0.58f, font_size, LIGHTBLUE, "L2 or RSTICK UP"); cellDbgFontPrintf (0.5f, 0.58f, font_size, LIGHTBLUE, "- Increase Viewport Height"); - cellDbgFontDraw(); + gl_render_msg_post(gl); cellDbgFontPrintf (0.09f, 0.60f, font_size, LIGHTBLUE, "R2 or RSTICK DOWN"); cellDbgFontPrintf (0.5f, 0.60f, font_size, LIGHTBLUE, "- Decrease Viewport Height"); @@ -2273,10 +2274,10 @@ static void ingame_menu(uint32_t menu_id) cellDbgFontPrintf (0.09f, 0.70f, font_size, LIGHTBLUE, "CIRCLE"); cellDbgFontPrintf (0.5f, 0.70f, font_size, LIGHTBLUE, "- Return to Ingame Menu"); - cellDbgFontDraw(); + gl_render_msg_post(gl); cellDbgFontPrintf (0.09f, 0.83f, 0.91f, LIGHTBLUE, "Allows you to resize the screen by moving around the two analog sticks.\nPress TRIANGLE to reset to default values, and CIRCLE to go back to the menu."); - cellDbgFontDraw(); + gl_render_msg_post(gl); } gfx_ctx_swap_buffers(); #ifdef HAVE_SYSUTILS @@ -2349,6 +2350,7 @@ static void ingame_menu(uint32_t menu_id) } strlcpy(comment, "Press 'CROSS' to choose a different emulator core.", sizeof(comment)); break; +#ifdef HAVE_MULTIMAN case MENU_ITEM_RETURN_TO_MULTIMAN: if(CTRL_CROSS(state) && path_file_exists(MULTIMAN_EXECUTABLE)) { @@ -2359,6 +2361,7 @@ static void ingame_menu(uint32_t menu_id) } strlcpy(comment, "Press 'CROSS' to quit the emulator and return to multiMAN.", sizeof(comment)); break; +#endif case MENU_ITEM_RETURN_TO_DASHBOARD: if(CTRL_CROSS(state)) rarch_settings_change(S_RETURN_TO_DASHBOARD); @@ -2397,7 +2400,7 @@ static void ingame_menu(uint32_t menu_id) rarch_settings_create_menu_item_label(strw_buffer, S_LBL_SAVE_STATE_SLOT, sizeof(strw_buffer)); cellDbgFontPrintf(x_position, ypos+(ypos_increment*MENU_ITEM_SAVE_STATE), font_size, MENU_ITEM_SELECTED(MENU_ITEM_SAVE_STATE), strw_buffer); - cellDbgFontDraw(); + gl_render_msg_post(gl); rarch_settings_create_menu_item_label(strw_buffer, S_LBL_ASPECT_RATIO, sizeof(strw_buffer)); cellDbgFontPrintf(x_position, (ypos+(ypos_increment*MENU_ITEM_KEEP_ASPECT_RATIO)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_KEEP_ASPECT_RATIO), strw_buffer); @@ -2406,11 +2409,11 @@ static void ingame_menu(uint32_t menu_id) rarch_settings_create_menu_item_label(strw_buffer, S_LBL_ROTATION, sizeof(strw_buffer)); cellDbgFontPrintf (x_position, (ypos+(ypos_increment*MENU_ITEM_ORIENTATION)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_ORIENTATION), strw_buffer); - cellDbgFontDraw(); + gl_render_msg_post(gl); rarch_settings_create_menu_item_label(strw_buffer, S_LBL_SCALE_FACTOR, sizeof(strw_buffer)); cellDbgFontPrintf (x_position, (ypos+(ypos_increment*MENU_ITEM_SCALE_FACTOR)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_SCALE_FACTOR), strw_buffer); - cellDbgFontDraw(); + gl_render_msg_post(gl); cellDbgFontPrintf(x_position, (ypos+(ypos_increment*MENU_ITEM_RESIZE_MODE)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RESIZE_MODE), "Resize Mode"); @@ -2418,23 +2421,25 @@ static void ingame_menu(uint32_t menu_id) cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_SCREENSHOT_MODE)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_SCREENSHOT_MODE), "Screenshot Mode"); - cellDbgFontDraw(); + gl_render_msg_post(gl); cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RESET)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RESET), "Reset"); cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_GAME)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_GAME), "Return to Game"); - cellDbgFontDraw(); + gl_render_msg_post(gl); cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_MENU)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MENU), "Return to Menu"); - cellDbgFontDraw(); + gl_render_msg_post(gl); cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_CHANGE_LIBRETRO)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_CHANGE_LIBRETRO), "Change libretro core"); - cellDbgFontDraw(); + gl_render_msg_post(gl); +#ifdef HAVE_MULTIMAN cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_MULTIMAN)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_MULTIMAN), "Return to multiMAN"); +#endif cellDbgFontPuts(x_position, (ypos+(ypos_increment*MENU_ITEM_RETURN_TO_DASHBOARD)), font_size, MENU_ITEM_SELECTED(MENU_ITEM_RETURN_TO_DASHBOARD), "Return to XMB"); - cellDbgFontDraw(); + gl_render_msg_post(gl); struct retro_system_info info; retro_get_system_info(&info); @@ -2443,11 +2448,9 @@ static void ingame_menu(uint32_t menu_id) cellDbgFontPuts(0.09f, 0.05f, FONT_SIZE, RED, "QUICK MENU"); cellDbgFontPrintf (0.3f, 0.05f, 0.82f, WHITE, "Libretro core: %s", id); cellDbgFontPrintf (0.8f, 0.09f, 0.82f, WHITE, "v%s", EMULATOR_VERSION); - cellDbgFontDraw(); - cellDbgFontPrintf (0.05f, 0.90f, 1.10f, WHITE, special_action_msg); - cellDbgFontDraw(); + gl_render_msg_post(gl); cellDbgFontPrintf(0.09f, 0.83f, 0.91f, LIGHTBLUE, comment); - cellDbgFontDraw(); + gl_render_msg_post(gl); old_state = state; } diff --git a/ps3/ps3_video_psgl.h b/ps3/ps3_video_psgl.h index eb4a935ee6..f0dceb6187 100644 --- a/ps3/ps3_video_psgl.h +++ b/ps3/ps3_video_psgl.h @@ -33,7 +33,6 @@ enum #define MAX_SCALING_FACTOR (4.0f) const char * ps3_get_resolution_label(uint32_t resolution); -int ps3_check_resolution(uint32_t resolution_id); void ps3_previous_resolution (void); void ps3_next_resolution (void); diff --git a/ps3/shared.h b/ps3/shared.h index 632be12571..7f6bb507ca 100644 --- a/ps3/shared.h +++ b/ps3/shared.h @@ -17,26 +17,6 @@ #ifndef _PS3_SHARED_H #define _PS3_SHARED_H -/* ABGR color format */ - -#define WHITE 0xffffffffu -#define RED 0xff0000ffu -#define GREEN 0xff00ff00u -#define BLUE 0xffff0000u -#define YELLOW 0xff00ffffu -#define PURPLE 0xffff00ffu -#define CYAN 0xffffff00u -#define ORANGE 0xff0063ffu -#define SILVER 0xff8c848cu -#define LIGHTBLUE 0xFFFFE0E0U -#define LIGHTORANGE 0xFFE0EEFFu - -enum -{ - EXTERN_LAUNCHER_SALAMANDER, - EXTERN_LAUNCHER_MULTIMAN -}; - enum { CONFIG_FILE, @@ -44,13 +24,6 @@ enum INPUT_PRESET_FILE }; -enum -{ - SOUND_MODE_NORMAL, - SOUND_MODE_RSOUND, - SOUND_MODE_HEADSET -}; - extern char contentInfoPath[PATH_MAX]; extern char usrDirPath[PATH_MAX]; extern char DEFAULT_PRESET_FILE[PATH_MAX];