Merge pull request #10293 from Crestwave/haiku

(Haiku) Use GL1 video driver by default
This commit is contained in:
Autechre 2020-03-17 06:57:08 +01:00 committed by GitHub
commit 3c4a959b83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -317,9 +317,9 @@ enum midi_driver_enum
static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_METAL; static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_METAL;
#elif defined(HAVE_VITA2D) #elif defined(HAVE_VITA2D)
static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VITA2D; static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VITA2D;
#elif (defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(__CELLOS_LV2__)) && !defined(__WINRT__) #elif (defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(__CELLOS_LV2__)) && !defined(__WINRT__) && !defined(__HAIKU__)
static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL; static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL;
#elif defined(HAVE_OPENGL_CORE) #elif defined(HAVE_OPENGL_CORE) && !defined(__HAIKU__)
static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL_CORE; static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL_CORE;
#elif defined(HAVE_OPENGL1) #elif defined(HAVE_OPENGL1)
static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL1; static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL1;