Merge pull request #12419 from crystalct/master

Change default video driver name for PSL1GHT
This commit is contained in:
Autechre 2021-05-20 05:30:26 +02:00 committed by GitHub
commit 29475a904f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions

View File

@ -93,6 +93,7 @@ enum video_driver_enum
VIDEO_GDI, VIDEO_GDI,
VIDEO_VGA, VIDEO_VGA,
VIDEO_FPGA, VIDEO_FPGA,
VIDEO_RSX,
VIDEO_NULL VIDEO_NULL
}; };
@ -265,7 +266,7 @@ static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_METAL;
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL1; static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL1;
#elif defined(HAVE_VITA2D) #elif defined(HAVE_VITA2D)
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VITA2D; static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VITA2D;
#elif defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(HAVE_PSGL) || defined(__PSL1GHT__) #elif defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(HAVE_PSGL)
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL; static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL;
#elif defined(HAVE_OPENGL_CORE) && !defined(__HAIKU__) #elif defined(HAVE_OPENGL_CORE) && !defined(__HAIKU__)
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL_CORE; static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL_CORE;
@ -315,6 +316,8 @@ static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VGA;
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_FPGA; static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_FPGA;
#elif defined(HAVE_DYLIB) && !defined(ANDROID) #elif defined(HAVE_DYLIB) && !defined(ANDROID)
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_EXT; static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_EXT;
#elif defined(__PSL1GHT__)
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_RSX;
#else #else
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_NULL; static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_NULL;
#endif #endif
@ -867,6 +870,8 @@ const char *config_get_default_video(void)
return "vga"; return "vga";
case VIDEO_FPGA: case VIDEO_FPGA:
return "fpga"; return "fpga";
case VIDEO_RSX:
return "rsx";
case VIDEO_NULL: case VIDEO_NULL:
break; break;
} }

View File

@ -517,7 +517,7 @@ VIDEO DRIVER
#endif #endif
#if defined(__PSL1GHT__) #if defined(__PSL1GHT__)
#include "../gfx/drivers/gcm_gfx.c" #include "../gfx/drivers/rsx_gfx.c"
#elif defined(GEKKO) #elif defined(GEKKO)
#include "../gfx/drivers/gx_gfx.c" #include "../gfx/drivers/gx_gfx.c"
#elif defined(PSP) #elif defined(PSP)