From 7c9706fdcf627e979265db7359ebc5eb5e2310a1 Mon Sep 17 00:00:00 2001 From: Lars Date: Thu, 18 Jan 2024 19:21:34 -0800 Subject: [PATCH] Remove unused meshgen_block_cache_size setting --- builtin/settingtypes.txt | 5 ----- src/client/mesh_generator_thread.cpp | 1 - src/client/mesh_generator_thread.h | 1 - src/defaultsettings.cpp | 1 - 4 files changed, 8 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 5105eb5ce..af821b5be 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -1826,11 +1826,6 @@ mesh_generation_interval (Mapblock mesh generation delay) int 0 0 50 # Value of 0 (default) will let Minetest autodetect the number of available threads. mesh_generation_threads (Mapblock mesh generation threads) int 0 0 8 -# Size of the MapBlock cache of the mesh generator. Increasing this will -# increase the cache hit %, reducing the data being copied from the main -# thread, thus reducing jitter. -meshgen_block_cache_size (Mapblock mesh generator's MapBlock cache size in MB) int 20 0 1000 - # True = 256 # False = 128 # Usable to make minimap smoother on slower machines. diff --git a/src/client/mesh_generator_thread.cpp b/src/client/mesh_generator_thread.cpp index 60605d3b7..167638269 100644 --- a/src/client/mesh_generator_thread.cpp +++ b/src/client/mesh_generator_thread.cpp @@ -54,7 +54,6 @@ MeshUpdateQueue::MeshUpdateQueue(Client *client): { m_cache_enable_shaders = g_settings->getBool("enable_shaders"); m_cache_smooth_lighting = g_settings->getBool("smooth_lighting"); - m_meshgen_block_cache_size = g_settings->getS32("meshgen_block_cache_size"); } MeshUpdateQueue::~MeshUpdateQueue() diff --git a/src/client/mesh_generator_thread.h b/src/client/mesh_generator_thread.h index c4f87cee2..61eb5c7ad 100644 --- a/src/client/mesh_generator_thread.h +++ b/src/client/mesh_generator_thread.h @@ -87,7 +87,6 @@ private: // TODO: Add callback to update these when g_settings changes bool m_cache_enable_shaders; bool m_cache_smooth_lighting; - int m_meshgen_block_cache_size; void fillDataFromMapBlocks(QueuedMeshUpdate *q); void cleanupCache(); diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 66b058115..bb1d8c78c 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -46,7 +46,6 @@ void set_default_settings() settings->setDefault("enable_mesh_cache", "false"); settings->setDefault("mesh_generation_interval", "0"); settings->setDefault("mesh_generation_threads", "0"); - settings->setDefault("meshgen_block_cache_size", "20"); settings->setDefault("enable_vbo", "true"); settings->setDefault("free_move", "false"); settings->setDefault("pitch_move", "false");