From 3f3262fba376efd0e6c98baf6b509bcc03c31a65 Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Thu, 23 Feb 2023 10:43:33 +0100 Subject: [PATCH] (PS3) Cleanups - don't assume GLSL is the default shader for PSL1GHT --- frontend/drivers/platform_ps3.c | 8 +------- gfx/video_driver.h | 2 +- input/input_keymaps.c | 1 + menu/cbs/menu_cbs_ok.c | 4 ++-- menu/drivers/xmb.c | 6 +++--- menu/menu_displaylist.c | 2 +- menu/menu_setting.c | 2 +- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c index add38d50b4..70d82879c7 100644 --- a/frontend/drivers/platform_ps3.c +++ b/frontend/drivers/platform_ps3.c @@ -227,12 +227,8 @@ static void frontend_ps3_get_env(int *argc, char *argv[], #if defined(HAVE_LOGGER) logger_init(); #elif defined(HAVE_FILE_LOGGER) -#ifdef __PSL1GHT__ retro_main_log_file_init("/dev_hdd0/game/" EMULATOR_CONTENT_DIR "/USRDIR/retroarch-log.txt", false); -#else - retro_main_log_file_init("/dev_hdd0/retroarch-log.txt", false); -#endif #endif #elif defined(__PSL1GHT__) #ifdef HAVE_FILE_LOGGER @@ -412,9 +408,9 @@ static bool frontend_ps3_set_fork(enum frontend_fork fork_mode) static int frontend_ps3_exec_exitspawn(const char *path, char const *argv[], char const *envp[]) { - int ret; unsigned i; char spawn_data[256]; + int ret = -1; #ifndef __PSL1GHT__ SceNpDrmKey *license_data = NULL; #endif @@ -426,8 +422,6 @@ static int frontend_ps3_exec_exitspawn(const char *path, ret = sceNpDrmProcessExitSpawn(license_data, path, (const char** const)argv, envp, (sys_addr_t)spawn_data, 256, 1000, SYS_PROCESS_SPAWN_STACK_SIZE_1M); -#else - ret = -1; #endif if (ret < 0) diff --git a/gfx/video_driver.h b/gfx/video_driver.h index 1f54bac87b..020851c688 100644 --- a/gfx/video_driver.h +++ b/gfx/video_driver.h @@ -69,7 +69,7 @@ #if defined(_XBOX360) #define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL -#elif defined(__PSL1GHT__) || defined(HAVE_OPENGLES2) || defined(HAVE_GLSL) +#elif defined(HAVE_OPENGLES2) || defined(HAVE_GLSL) #define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL #elif defined(HAVE_CG) #define DEFAULT_SHADER_TYPE RARCH_SHADER_CG diff --git a/input/input_keymaps.c b/input/input_keymaps.c index 5084bd8fe0..5b1a8b305a 100644 --- a/input/input_keymaps.c +++ b/input/input_keymaps.c @@ -46,6 +46,7 @@ #include #else #include +#include #endif #endif diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 1b42f798f9..e2bc9800ba 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -7208,7 +7208,7 @@ static int generic_dropdown_box_list(size_t idx, unsigned lbl) static int action_ok_video_resolution(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { -#if defined(GEKKO) || defined(PS2) || !defined(__PSL1GHT__) && defined(__PS3__) +#if defined(GEKKO) || defined(PS2) || defined(__PS3__) unsigned width = 0; unsigned height = 0; char desc[64] = {0}; @@ -7219,7 +7219,7 @@ static int action_ok_video_resolution(const char *path, msg[0] = '\0'; -#if defined(_WIN32) || !defined(__PSL1GHT__) && defined(__PS3__) +#if defined(_WIN32) || defined(__PS3__) generic_action_ok_command(CMD_EVENT_REINIT); #endif video_driver_set_video_mode(width, height, true); diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 9b25da319a..4191bb0381 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -902,7 +902,7 @@ static void xmb_draw_icon( draw.height = icon_size; draw.rotation = rotation; draw.scale_factor = scale_factor; -#if defined(VITA) || defined(WIIU) || defined(__PSL1GHT__) +#if defined(VITA) || defined(WIIU) || defined(__PS3__) draw.width *= scale_factor; draw.height *= scale_factor; #endif @@ -920,7 +920,7 @@ static void xmb_draw_icon( draw.x = x + shadow_offset; draw.y = height - y - shadow_offset; -#if defined(VITA) || defined(WIIU) || defined(__PSL1GHT__) +#if defined(VITA) || defined(WIIU) || defined(__PS3__) if (scale_factor < 1) { draw.x = draw.x + (icon_size-draw.width)/2; @@ -936,7 +936,7 @@ static void xmb_draw_icon( draw.x = x; draw.y = height - y; -#if defined(VITA) || defined(WIIU) || defined(__PSL1GHT__) +#if defined(VITA) || defined(WIIU) || defined(__PS3__) if (scale_factor < 1) { draw.x = draw.x + (icon_size-draw.width)/2; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 513e249389..486e9f538a 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -8799,7 +8799,7 @@ unsigned menu_displaylist_build_list( count++; #endif -#if defined(GEKKO) || defined(PS2) || !defined(__PSL1GHT__) && defined(__PS3__) +#if defined(GEKKO) || defined(PS2) || defined(__PS3__) if (true) #else if (video_display_server_has_resolution_list()) diff --git a/menu/menu_setting.c b/menu/menu_setting.c index e891d1d980..29fa9962eb 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -12277,7 +12277,7 @@ static bool setting_append_list( CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); -#if defined(GEKKO) || defined(PS2) || !defined(__PSL1GHT__) && defined(__PS3__) +#if defined(GEKKO) || defined(PS2) || defined(__PS3__) if (true) #else if (!string_is_equal(video_display_server_get_ident(), "null"))