diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-27 16:54:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-27 16:54:22 +0200 |
| commit | c1f687c6818883f70c2b7f85577c51ed5ad65c08 (patch) | |
| tree | 68bf6b19674bd54ab6662a12cfd6aee37a4a4d83 /main/main.cpp | |
| parent | 78bb53f85d97d3a5b66d9005732c3c07c1f0e636 (diff) | |
| parent | 08f452d1a95d7f171472c33a60983d95adf1665d (diff) | |
Merge pull request #21387 from hpvb/fix-15324
Fall back to GLES2 if GLES3 is not working
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp index 21851337b7..a336496d39 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -830,6 +830,9 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph video_driver = GLOBAL_GET("rendering/quality/driver/driver_name"); } + GLOBAL_DEF("rendering/quality/driver/driver_fallback", "Best"); + ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/driver/driver_fallback", PropertyInfo(Variant::STRING, "rendering/quality/driver/driver_fallback", PROPERTY_HINT_ENUM, "Best,Never")); + GLOBAL_DEF("display/window/size/width", 1024); GLOBAL_DEF("display/window/size/height", 600); GLOBAL_DEF("display/window/size/resizable", true); @@ -1040,6 +1043,7 @@ Error Main::setup2(Thread::ID p_main_tid_override) { if (err != OK) { return err; } + if (init_use_custom_pos) { OS::get_singleton()->set_window_position(init_custom_pos); } |