From 5b3f6a6d3458638d88fb18c944d3e171d0c9a520 Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Thu, 5 Aug 2021 18:23:33 +0200 Subject: [PATCH] Point at software OpenGL when OpenGL fails to initialize on X11 (cherry picked from commit 8fbdcb6fea6d075bb934e99711bf0cb44b66cfc0) --- platform/osx/os_osx.mm | 2 +- platform/uwp/os_uwp.cpp | 2 +- platform/windows/os_windows.cpp | 2 +- platform/x11/os_x11.cpp | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 52805e9b0c5..3008bf0e2b0 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1763,7 +1763,7 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a if (gl_initialization_error) { OS::get_singleton()->alert("Your video card driver does not support any of the supported OpenGL versions.\n" - "Please update your drivers or if you have a very old or integrated GPU upgrade it.", + "Please update your drivers or if you have a very old or integrated GPU, upgrade it.", "Unable to initialize Video driver"); return ERR_UNAVAILABLE; } diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp index 6e9cb4bab48..08fc59728d4 100644 --- a/platform/uwp/os_uwp.cpp +++ b/platform/uwp/os_uwp.cpp @@ -240,7 +240,7 @@ Error OS_UWP::initialize(const VideoMode &p_desired, int p_video_driver, int p_a if (gl_initialization_error) { OS::get_singleton()->alert("Your video card driver does not support any of the supported OpenGL versions.\n" - "Please update your drivers or if you have a very old or integrated GPU upgrade it.", + "Please update your drivers or if you have a very old or integrated GPU, upgrade it.", "Unable to initialize Video driver"); return ERR_UNAVAILABLE; } diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index a49a41ce620..f22a899bb7a 100755 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1644,7 +1644,7 @@ Error OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int if (gl_initialization_error) { OS::get_singleton()->alert("Your video card driver does not support any of the supported OpenGL versions.\n" - "Please update your drivers or if you have a very old or integrated GPU upgrade it.", + "Please update your drivers or if you have a very old or integrated GPU, upgrade it.", "Unable to initialize Video driver"); return ERR_UNAVAILABLE; } diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index ae258338ba1..4adb9212eeb 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -357,7 +357,9 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a if (gl_initialization_error) { OS::get_singleton()->alert("Your video card driver does not support any of the supported OpenGL versions.\n" - "Please update your drivers or if you have a very old or integrated GPU upgrade it.", + "Please update your drivers or if you have a very old or integrated GPU, upgrade it.\n" + "Alternatively, you can force software rendering by running Godot with the `LIBGL_ALWAYS_SOFTWARE=1`\n" + "environment variable set, but this will be very slow.", "Unable to initialize Video driver"); return ERR_UNAVAILABLE; }