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

(PS3) Cleanups - don't assume GLSL is the default shader for PSL1GHT

Browse Source
This commit is contained in:
libretroadmin 2023-02-23 10:43:33 +01:00
parent a4ff8f9320
commit 3f3262fba3
7 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/drivers/platform_ps3.c
View File

@ -227,12 +227,8 @@ static void frontend_ps3_get_env(int *argc, char *argv[],
#if defined(HAVE_LOGGER) #if defined(HAVE_LOGGER)
logger_init(); logger_init();
#elif defined(HAVE_FILE_LOGGER) #elif defined(HAVE_FILE_LOGGER)
#ifdef __PSL1GHT__
retro_main_log_file_init("/dev_hdd0/game/" retro_main_log_file_init("/dev_hdd0/game/"
EMULATOR_CONTENT_DIR "/USRDIR/retroarch-log.txt", false); EMULATOR_CONTENT_DIR "/USRDIR/retroarch-log.txt", false);
#else
retro_main_log_file_init("/dev_hdd0/retroarch-log.txt", false);
#endif
#endif #endif
#elif defined(__PSL1GHT__) #elif defined(__PSL1GHT__)
#ifdef HAVE_FILE_LOGGER #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, static int frontend_ps3_exec_exitspawn(const char *path,
char const *argv[], char const *envp[]) char const *argv[], char const *envp[])
{ {
int ret;
unsigned i; unsigned i;
char spawn_data[256]; char spawn_data[256];
int ret = -1;
#ifndef __PSL1GHT__ #ifndef __PSL1GHT__
SceNpDrmKey *license_data = NULL; SceNpDrmKey *license_data = NULL;
#endif #endif
@ -426,8 +422,6 @@ static int frontend_ps3_exec_exitspawn(const char *path,
ret = sceNpDrmProcessExitSpawn(license_data, path, ret = sceNpDrmProcessExitSpawn(license_data, path,
(const char** const)argv, envp, (sys_addr_t)spawn_data, (const char** const)argv, envp, (sys_addr_t)spawn_data,
256, 1000, SYS_PROCESS_SPAWN_STACK_SIZE_1M); 256, 1000, SYS_PROCESS_SPAWN_STACK_SIZE_1M);
#else
ret = -1;
#endif #endif
if (ret < 0) if (ret < 0)

2
gfx/video_driver.h
View File

@ -69,7 +69,7 @@
#if defined(_XBOX360) #if defined(_XBOX360)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL #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 #define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
#elif defined(HAVE_CG) #elif defined(HAVE_CG)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_CG #define DEFAULT_SHADER_TYPE RARCH_SHADER_CG

1
input/input_keymaps.c
View File

@ -46,6 +46,7 @@
#include <io/kb.h> #include <io/kb.h>
#else #else
#include <ps3_defines.h> #include <ps3_defines.h>
#include <cell/keyboard.h>
#endif #endif
#endif #endif

4
menu/cbs/menu_cbs_ok.c
View File

@ -7208,7 +7208,7 @@ static int generic_dropdown_box_list(size_t idx, unsigned lbl)
static int action_ok_video_resolution(const char *path, static int action_ok_video_resolution(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) 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 width = 0;
unsigned height = 0; unsigned height = 0;
char desc[64] = {0}; char desc[64] = {0};
@ -7219,7 +7219,7 @@ static int action_ok_video_resolution(const char *path,
msg[0] = '\0'; msg[0] = '\0';
#if defined(_WIN32) || !defined(__PSL1GHT__) && defined(__PS3__) #if defined(_WIN32) || defined(__PS3__)
generic_action_ok_command(CMD_EVENT_REINIT); generic_action_ok_command(CMD_EVENT_REINIT);
#endif #endif
video_driver_set_video_mode(width, height, true); video_driver_set_video_mode(width, height, true);

6
menu/drivers/xmb.c
View File

@ -902,7 +902,7 @@ static void xmb_draw_icon(
draw.height = icon_size; draw.height = icon_size;
draw.rotation = rotation; draw.rotation = rotation;
draw.scale_factor = scale_factor; draw.scale_factor = scale_factor;
#if defined(VITA) || defined(WIIU) || defined(__PSL1GHT__) #if defined(VITA) || defined(WIIU) || defined(__PS3__)
draw.width *= scale_factor; draw.width *= scale_factor;
draw.height *= scale_factor; draw.height *= scale_factor;
#endif #endif
@ -920,7 +920,7 @@ static void xmb_draw_icon(
draw.x = x + shadow_offset; draw.x = x + shadow_offset;
draw.y = height - y - 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) if (scale_factor < 1)
{ {
draw.x = draw.x + (icon_size-draw.width)/2; draw.x = draw.x + (icon_size-draw.width)/2;
@ -936,7 +936,7 @@ static void xmb_draw_icon(
draw.x = x; draw.x = x;
draw.y = height - y; draw.y = height - y;
#if defined(VITA) || defined(WIIU) || defined(__PSL1GHT__) #if defined(VITA) || defined(WIIU) || defined(__PS3__)
if (scale_factor < 1) if (scale_factor < 1)
{ {
draw.x = draw.x + (icon_size-draw.width)/2; draw.x = draw.x + (icon_size-draw.width)/2;

2
menu/menu_displaylist.c
View File

@ -8799,7 +8799,7 @@ unsigned menu_displaylist_build_list(
count++; count++;
#endif #endif
#if defined(GEKKO) || defined(PS2) || !defined(__PSL1GHT__) && defined(__PS3__) #if defined(GEKKO) || defined(PS2) || defined(__PS3__)
if (true) if (true)
#else #else
if (video_display_server_has_resolution_list()) if (video_display_server_has_resolution_list())

2
menu/menu_setting.c
View File

@ -12277,7 +12277,7 @@ static bool setting_append_list(
CMD_EVENT_VIDEO_APPLY_STATE_CHANGES); CMD_EVENT_VIDEO_APPLY_STATE_CHANGES);
SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED); 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) if (true)
#else #else
if (!string_is_equal(video_display_server_get_ident(), "null")) if (!string_is_equal(video_display_server_get_ident(), "null"))