diff options
| author | Vitaliy <silverunicorn2011@yandex.ru> | 2018-07-21 10:26:40 +0300 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2018-07-21 09:26:40 +0200 |
| commit | c022ddce4bb0da68a842c6479ecd7d9660d7c2fe (patch) | |
| tree | 99631c566d4cafe81c226da33fc908249a92750a | |
| parent | 78a801e42daf53eca0fcc6e791b9eb49e850c207 (diff) | |
| download | minetest-c022ddce4bb0da68a842c6479ecd7d9660d7c2fe.tar.gz minetest-c022ddce4bb0da68a842c6479ecd7d9660d7c2fe.tar.bz2 minetest-c022ddce4bb0da68a842c6479ecd7d9660d7c2fe.zip | |
Disable shaders GUI on unsupported drivers (#7563)
* Disable shaders GUI on unsupported drivers (#2060)
* Disable shaders if unavailable
| -rw-r--r-- | builtin/mainmenu/tab_settings.lua | 21 | ||||
| -rw-r--r-- | builtin/settingtypes.txt | 4 |
2 files changed, 21 insertions, 4 deletions
diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index adf6c58ce..11611919e 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -203,9 +203,22 @@ local function formspec(tabview, name, tabdata) "label[4.25,3.45;" .. fgettext("Screen:") .. "]" .. "checkbox[4.25,3.6;cb_autosave_screensize;" .. fgettext("Autosave Screen Size") .. ";" .. dump(core.settings:get_bool("autosave_screensize")) .. "]" .. - "box[8,0;3.75,4.5;#999999]" .. - "checkbox[8.25,0;cb_shaders;" .. fgettext("Shaders") .. ";" - .. dump(core.settings:get_bool("enable_shaders")) .. "]" + "box[8,0;3.75,4.5;#999999]" + + local video_driver = core.settings:get("video_driver") + local shaders_supported = video_driver == "opengl" + local shaders_enabled = false + if shaders_supported then + shaders_enabled = core.settings:get_bool("enable_shaders") + tab_string = tab_string .. + "checkbox[8.25,0;cb_shaders;" .. fgettext("Shaders") .. ";" + .. tostring(shaders_enabled) .. "]" + else + core.settings:set_bool("enable_shaders", false) + tab_string = tab_string .. + "label[8.38,0.2;" .. core.colorize("#888888", + fgettext("Shaders (unavailable)")) .. "]" + end if PLATFORM == "Android" then tab_string = tab_string .. @@ -229,7 +242,7 @@ local function formspec(tabview, name, tabdata) ((tonumber(core.settings:get("touchscreen_threshold")) / 10) + 1) .. "]" end - if core.settings:get_bool("enable_shaders") then + if shaders_enabled then tab_string = tab_string .. "checkbox[8.25,0.5;cb_bumpmapping;" .. fgettext("Bump Mapping") .. ";" .. dump(core.settings:get_bool("enable_bumpmapping")) .. "]" .. diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 9a62ae964..d7ff01b46 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -608,6 +608,10 @@ lighting_boost_spread (Light curve mid boost spread) float 0.2 0.0 1.0 texture_path (Texture path) path # The rendering back-end for Irrlicht. +# A restart is required after changing this. +# Note: on Android, stick with OGLES1 if unsure! App may fail to start otherwise. +# On other platforms, OpenGL is recommended, and it’s the only driver with +# shader support currently. video_driver (Video driver) enum opengl null,software,burningsvideo,direct3d8,direct3d9,opengl,ogles1,ogles2 # Radius of cloud area stated in number of 64 node cloud squares. |