Skip to content

Commit 20a8129

Browse files
committed
We can default to d3d9_hlsl for XP builds now that we have
a robust d3d9_hlsl driver
1 parent be45b30 commit 20a8129

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

configuration.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -446,17 +446,14 @@ static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_METAL;
446446
#elif defined(HAVE_D3D11) || defined(__WINRT__) || (defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP)
447447
/* Default to D3D11 in UWP, even when its compiled with ANGLE, since ANGLE is just calling D3D anyway.*/
448448
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_D3D11;
449-
#elif defined(HAVE_OPENGL1) && defined(_MSC_VER) && (_MSC_VER <= 1600)
450-
/* On Windows XP and earlier, use gl1 by default
451-
* (regular opengl has compatibility issues with
452-
* obsolete hardware drivers...) */
453-
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL1;
454449
#elif defined(HAVE_VITA2D)
455450
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VITA2D;
456451
#elif defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(HAVE_PSGL)
457452
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL;
458453
#elif defined(HAVE_OPENGL_CORE) && !defined(__HAIKU__)
459454
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL_CORE;
455+
#elif defined(HAVE_D3D9) && defined(HAVE_HLSL)
456+
#define GFX_VIDEO_DRIVER_DEFAULT "d3d9_hlsl"
460457
#elif defined(HAVE_OPENGL1)
461458
static const enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL1;
462459
#elif defined(HAVE_VULKAN)

0 commit comments

Comments
 (0)