2
0
Fork 0

Merge pull request #86001 from bruvzg/win_arm_angle

[Windows] Always use ANGLE in ARM builds.
master
Rémi Verschelde 2023-12-12 00:33:49 +07:00
commit 4921144024
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 0 deletions

@ -4647,6 +4647,12 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
// Init context and rendering device
#if defined(GLES3_ENABLED)
#if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARM64)
// There's no native OpenGL drivers on Windows for ARM, switch to ANGLE over DX.
if (rendering_driver == "opengl3") {
rendering_driver = "opengl3_angle";
}
#else
bool fallback = GLOBAL_GET("rendering/gl_compatibility/fallback_to_angle");
if (fallback && (rendering_driver == "opengl3")) {
Dictionary gl_info = detect_wgl();
@ -4667,6 +4673,7 @@ DisplayServerWindows::DisplayServerWindows(const String &p_rendering_driver, Win
rendering_driver = "opengl3_angle";
}
}
#endif
if (rendering_driver == "opengl3") {
gl_manager_native = memnew(GLManagerNative_Windows);