Merge pull request #51287 from Calinou/x11-software-opengl

Point at software OpenGL when OpenGL fails to initialize on X11
This commit is contained in:
Rémi Verschelde 2021-08-05 19:38:25 +02:00 committed by GitHub
commit 93ff6e790b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions

View File

@ -1738,7 +1738,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;
}

View File

@ -230,7 +230,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;
}

View File

@ -1594,7 +1594,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;
}

View File

@ -350,7 +350,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;
}