Skip to content

Commit edf098d

Browse files
sfan5sfan5
committedJun 16, 2021
Drop --videomodes, fullscreen_bpp and high_precision_fpu settings
These have been pointless for a while.
·
5.11.05.5.0
1 parent dc165fe commit edf098d

9 files changed

+3
-122
lines changed
 

‎builtin/settingtypes.txt

+2-8
Original file line numberDiff line numberDiff line change
@@ -660,10 +660,10 @@ viewing_range (Viewing range) int 190 20 4000
660660
# 0.1 = Default, 0.25 = Good value for weaker tablets.
661661
near_plane (Near plane) float 0.1 0 0.25
662662

663-
# Width component of the initial window size.
663+
# Width component of the initial window size. Ignored in fullscreen mode.
664664
screen_w (Screen width) int 1024 1
665665

666-
# Height component of the initial window size.
666+
# Height component of the initial window size. Ignored in fullscreen mode.
667667
screen_h (Screen height) int 600 1
668668

669669
# Save window size automatically when modified.
@@ -672,9 +672,6 @@ autosave_screensize (Autosave screen size) bool true
672672
# Fullscreen mode.
673673
fullscreen (Full screen) bool false
674674

675-
# Bits per pixel (aka color depth) in fullscreen mode.
676-
fullscreen_bpp (Full screen BPP) int 24
677-
678675
# Vertical screen synchronization.
679676
vsync (VSync) bool false
680677

@@ -1477,9 +1474,6 @@ curl_parallel_limit (cURL parallel limit) int 8
14771474
# Maximum time a file download (e.g. a mod download) may take, stated in milliseconds.
14781475
curl_file_download_timeout (cURL file download timeout) int 300000
14791476

1480-
# Makes DirectX work with LuaJIT. Disable if it causes troubles.
1481-
high_precision_fpu (High-precision FPU) bool true
1482-
14831477
# Replaces the default main menu with a custom one.
14841478
main_menu_script (Main menu script) string
14851479

‎src/client/clientlauncher.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
9999

100100
init_args(start_data, cmd_args);
101101

102-
// List video modes if requested
103-
if (list_video_modes)
104-
return m_rendering_engine->print_video_modes();
105-
106102
#if USE_SOUND
107103
if (g_settings->getBool("enable_sound"))
108104
g_sound_manager_singleton = createSoundManagerSingleton();
@@ -336,8 +332,6 @@ void ClientLauncher::init_args(GameStartData &start_data, const Settings &cmd_ar
336332
if (cmd_args.exists("name"))
337333
start_data.name = cmd_args.get("name");
338334

339-
list_video_modes = cmd_args.getFlag("videomodes");
340-
341335
random_input = g_settings->getBool("random_input")
342336
|| cmd_args.getFlag("random-input");
343337
}

‎src/client/clientlauncher.h

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ class ClientLauncher
4646

4747
void speed_tests();
4848

49-
bool list_video_modes = false;
5049
bool skip_main_menu = false;
5150
bool random_input = false;
5251
RenderingEngine *m_rendering_engine = nullptr;

‎src/client/renderingengine.cpp

+1-77
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
9292

9393
// bpp, fsaa, vsync
9494
bool vsync = g_settings->getBool("vsync");
95-
u16 bits = g_settings->getU16("fullscreen_bpp");
9695
u16 fsaa = g_settings->getU16("fsaa");
9796

9897
// stereo buffer required for pageflip stereo
@@ -122,15 +121,13 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
122121
params.LoggingLevel = irr::ELL_DEBUG;
123122
params.DriverType = driverType;
124123
params.WindowSize = core::dimension2d<u32>(screen_w, screen_h);
125-
params.Bits = bits;
126124
params.AntiAlias = fsaa;
127125
params.Fullscreen = fullscreen;
128126
params.Stencilbuffer = false;
129127
params.Stereobuffer = stereo_buffer;
130128
params.Vsync = vsync;
131129
params.EventReceiver = receiver;
132-
params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
133-
params.ZBufferBits = 24;
130+
params.HighPrecisionFPU = true;
134131
#ifdef __ANDROID__
135132
params.PrivateData = porting::app_global;
136133
#endif
@@ -171,60 +168,6 @@ void RenderingEngine::setResizable(bool resize)
171168
m_device->setResizable(resize);
172169
}
173170

174-
bool RenderingEngine::print_video_modes()
175-
{
176-
IrrlichtDevice *nulldevice;
177-
178-
bool vsync = g_settings->getBool("vsync");
179-
u16 fsaa = g_settings->getU16("fsaa");
180-
MyEventReceiver *receiver = new MyEventReceiver();
181-
182-
SIrrlichtCreationParameters params = SIrrlichtCreationParameters();
183-
params.DriverType = video::EDT_NULL;
184-
params.WindowSize = core::dimension2d<u32>(640, 480);
185-
params.Bits = 24;
186-
params.AntiAlias = fsaa;
187-
params.Fullscreen = false;
188-
params.Stencilbuffer = false;
189-
params.Vsync = vsync;
190-
params.EventReceiver = receiver;
191-
params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
192-
193-
nulldevice = createDeviceEx(params);
194-
195-
if (!nulldevice) {
196-
delete receiver;
197-
return false;
198-
}
199-
200-
std::cout << _("Available video modes (WxHxD):") << std::endl;
201-
202-
video::IVideoModeList *videomode_list = nulldevice->getVideoModeList();
203-
204-
if (videomode_list != NULL) {
205-
s32 videomode_count = videomode_list->getVideoModeCount();
206-
core::dimension2d<u32> videomode_res;
207-
s32 videomode_depth;
208-
for (s32 i = 0; i < videomode_count; ++i) {
209-
videomode_res = videomode_list->getVideoModeResolution(i);
210-
videomode_depth = videomode_list->getVideoModeDepth(i);
211-
std::cout << videomode_res.Width << "x" << videomode_res.Height
212-
<< "x" << videomode_depth << std::endl;
213-
}
214-
215-
std::cout << _("Active video mode (WxHxD):") << std::endl;
216-
videomode_res = videomode_list->getDesktopResolution();
217-
videomode_depth = videomode_list->getDesktopDepth();
218-
std::cout << videomode_res.Width << "x" << videomode_res.Height << "x"
219-
<< videomode_depth << std::endl;
220-
}
221-
222-
nulldevice->drop();
223-
delete receiver;
224-
225-
return videomode_list != NULL;
226-
}
227-
228171
void RenderingEngine::removeMesh(const scene::IMesh* mesh)
229172
{
230173
m_device->getSceneManager()->getMeshCache()->removeMesh(mesh);
@@ -582,25 +525,6 @@ void RenderingEngine::draw_menu_scene(gui::IGUIEnvironment *guienv,
582525
get_video_driver()->endScene();
583526
}
584527

585-
std::vector<core::vector3d<u32>> RenderingEngine::getSupportedVideoModes()
586-
{
587-
IrrlichtDevice *nulldevice = createDevice(video::EDT_NULL);
588-
sanity_check(nulldevice);
589-
590-
std::vector<core::vector3d<u32>> mlist;
591-
video::IVideoModeList *modelist = nulldevice->getVideoModeList();
592-
593-
s32 num_modes = modelist->getVideoModeCount();
594-
for (s32 i = 0; i != num_modes; i++) {
595-
core::dimension2d<u32> mode_res = modelist->getVideoModeResolution(i);
596-
u32 mode_depth = (u32)modelist->getVideoModeDepth(i);
597-
mlist.emplace_back(mode_res.Width, mode_res.Height, mode_depth);
598-
}
599-
600-
nulldevice->drop();
601-
return mlist;
602-
}
603-
604528
std::vector<irr::video::E_DRIVER_TYPE> RenderingEngine::getSupportedVideoDrivers()
605529
{
606530
std::vector<irr::video::E_DRIVER_TYPE> drivers;

‎src/client/renderingengine.h

-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ class RenderingEngine
124124
return s_singleton->core->get_shadow_renderer();
125125
return nullptr;
126126
}
127-
static std::vector<core::vector3d<u32>> getSupportedVideoModes();
128127
static std::vector<irr::video::E_DRIVER_TYPE> getSupportedVideoDrivers();
129128

130129
private:

‎src/defaultsettings.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ void set_default_settings()
177177
settings->setDefault("screen_h", "600");
178178
settings->setDefault("autosave_screensize", "true");
179179
settings->setDefault("fullscreen", "false");
180-
settings->setDefault("fullscreen_bpp", "24");
181180
settings->setDefault("vsync", "false");
182181
settings->setDefault("fov", "72");
183182
settings->setDefault("leaves_style", "fancy");
@@ -454,7 +453,6 @@ void set_default_settings()
454453
settings->setDefault("server_name", "");
455454
settings->setDefault("server_description", "");
456455

457-
settings->setDefault("high_precision_fpu", "true");
458456
settings->setDefault("enable_console", "false");
459457
settings->setDefault("screen_dpi", "72");
460458

‎src/main.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,6 @@ static void set_allowed_options(OptionList *allowed_options)
304304
allowed_options->insert(std::make_pair("terminal", ValueSpec(VALUETYPE_FLAG,
305305
_("Feature an interactive terminal (Only works when using minetestserver or with --server)"))));
306306
#ifndef SERVER
307-
allowed_options->insert(std::make_pair("videomodes", ValueSpec(VALUETYPE_FLAG,
308-
_("Show available video modes"))));
309307
allowed_options->insert(std::make_pair("speedtests", ValueSpec(VALUETYPE_FLAG,
310308
_("Run speed tests"))));
311309
allowed_options->insert(std::make_pair("address", ValueSpec(VALUETYPE_STRING,

‎src/script/lua_api/l_mainmenu.cpp

-23
Original file line numberDiff line numberDiff line change
@@ -752,28 +752,6 @@ int ModApiMainMenu::l_get_video_drivers(lua_State *L)
752752
return 1;
753753
}
754754

755-
/******************************************************************************/
756-
int ModApiMainMenu::l_get_video_modes(lua_State *L)
757-
{
758-
std::vector<core::vector3d<u32> > videomodes
759-
= RenderingEngine::getSupportedVideoModes();
760-
761-
lua_newtable(L);
762-
for (u32 i = 0; i != videomodes.size(); i++) {
763-
lua_newtable(L);
764-
lua_pushnumber(L, videomodes[i].X);
765-
lua_setfield(L, -2, "w");
766-
lua_pushnumber(L, videomodes[i].Y);
767-
lua_setfield(L, -2, "h");
768-
lua_pushnumber(L, videomodes[i].Z);
769-
lua_setfield(L, -2, "depth");
770-
771-
lua_rawseti(L, -2, i + 1);
772-
}
773-
774-
return 1;
775-
}
776-
777755
/******************************************************************************/
778756
int ModApiMainMenu::l_gettext(lua_State *L)
779757
{
@@ -895,7 +873,6 @@ void ModApiMainMenu::Initialize(lua_State *L, int top)
895873
API_FCT(download_file);
896874
API_FCT(gettext);
897875
API_FCT(get_video_drivers);
898-
API_FCT(get_video_modes);
899876
API_FCT(get_screen_info);
900877
API_FCT(get_min_supp_proto);
901878
API_FCT(get_max_supp_proto);

‎src/script/lua_api/l_mainmenu.h

-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ class ModApiMainMenu: public ModApiBase
140140

141141
static int l_get_video_drivers(lua_State *L);
142142

143-
static int l_get_video_modes(lua_State *L);
144-
145143
//version compatibility
146144
static int l_get_min_supp_proto(lua_State *L);
147145

0 commit comments

Comments
 (0)
Please sign in to comment.