Skip to content

Commit

Permalink
Merge pull request #86001 from bruvzg/win_arm_angle
Browse files Browse the repository at this point in the history
[Windows] Always use ANGLE in ARM builds.
  • Loading branch information
akien-mga committed Dec 11, 2023
2 parents e551672 + b65635a commit 4921144
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions platform/windows/display_server_windows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
Expand Down

0 comments on commit 4921144

Please sign in to comment.