Merge pull request #12167 from crystalct/master

Add some PSL1GHT ifdefs
This commit is contained in:
Autechre 2021-03-17 09:53:57 +01:00 committed by GitHub
commit be7dd98939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 3 deletions

View File

@ -768,7 +768,7 @@ void recording_driver_update_streaming_url(void);
#define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL
#elif defined(__PSL1GHT__) || defined(HAVE_OPENGLES2) || defined(HAVE_GLSL)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
#elif defined(__CELLOS_LV2__) || defined(HAVE_CG)
#elif defined(HAVE_CG)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_CG
#else
#define DEFAULT_SHADER_TYPE RARCH_SHADER_NONE

View File

@ -758,7 +758,7 @@ static const gfx_ctx_driver_t *gfx_ctx_gl_drivers[] = {
&vita_ctx,
#endif
#if !defined(__PSL1GHT__) && defined(__PS3__)
&gfx_ctx_videocore,
&gfx_ctx_ps3,
#endif
#if defined(HAVE_LIBNX) && defined(HAVE_OPENGL)
&switch_ctx,

View File

@ -757,7 +757,11 @@ static void task_save_handler(retro_task_t *task)
if (task_get_cancelled(task) || written != remaining)
{
#if defined(__PSL1GHT__) || defined(__PS3__)
char *err = (char*)malloc(8192 * sizeof(char));
#else
char err[8192];
#endif
err[0] = '\0';
@ -778,6 +782,9 @@ static void task_save_handler(retro_task_t *task)
task_set_error(task, strdup(err));
task_save_handler_finished(task, state);
#if defined(__PSL1GHT__) || defined(__PS3__)
free(err);
#endif
return;
}
@ -995,7 +1002,11 @@ static void task_load_handler(retro_task_t *task)
if (state->bytes_read == state->size)
{
#if defined(__PSL1GHT__) || defined(__PS3__)
char *msg = (char*)malloc(8192 * sizeof(char));
#else
char msg[8192];
#endif
msg[0] = '\0';
@ -1023,7 +1034,9 @@ static void task_load_handler(retro_task_t *task)
task_set_title(task, strdup(msg));
task_load_handler_finished(task, state);
#if defined(__PSL1GHT__) || defined(__PS3__)
free(msg);
#endif
return;
}

View File

@ -18,6 +18,10 @@
#include <xtl.h>
#endif
#if defined(__PSL1GHT__) || defined(__PS3__)
#include "ps3_defines.h"
#endif
#ifdef __MACH__
#include <TargetConditionals.h>
#if TARGET_IPHONE_SIMULATOR