diff options
| author | paradust7 <102263465+paradust7@users.noreply.github.com> | 2022-04-28 09:52:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-28 18:52:19 +0200 |
| commit | 7e18a1f1be2692bde078c1b77982da916c871497 (patch) | |
| tree | cca798f0f5121bef9d36844c80e054509ff0925e /src/client | |
| parent | 7f4fc6f8a77cd0e454ce98ff92da8c8d6592afba (diff) | |
| download | minetest-7e18a1f1be2692bde078c1b77982da916c871497.tar.gz minetest-7e18a1f1be2692bde078c1b77982da916c871497.tar.bz2 minetest-7e18a1f1be2692bde078c1b77982da916c871497.zip | |
Remove HW_buffer_counter after IrrlichtMt fix to remove HWBufferMap (#12232)
Keep code and use version check instead, for backwards compatibility
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/game.cpp | 5 | ||||
| -rw-r--r-- | src/client/mapblock_mesh.cpp | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/client/game.cpp b/src/client/game.cpp index b877ba04a..1290534eb 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -907,7 +907,10 @@ private: bool m_does_lost_focus_pause_game = false; +#if IRRLICHT_VERSION_MT_REVISION < 5 int m_reset_HW_buffer_counter = 0; +#endif + #ifdef HAVE_TOUCHSCREENGUI bool m_cache_hold_aux1; #endif @@ -3990,6 +3993,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime, /* ==================== End scene ==================== */ +#if IRRLICHT_VERSION_MT_REVISION < 5 if (++m_reset_HW_buffer_counter > 500) { /* Periodically remove all mesh HW buffers. @@ -4011,6 +4015,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime, driver->removeAllHardwareBuffers(); m_reset_HW_buffer_counter = 0; } +#endif driver->endScene(); diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp index 8c7d66186..2c5500fca 100644 --- a/src/client/mapblock_mesh.cpp +++ b/src/client/mapblock_mesh.cpp @@ -1390,12 +1390,14 @@ MapBlockMesh::MapBlockMesh(MeshMakeData *data, v3s16 camera_offset): MapBlockMesh::~MapBlockMesh() { for (scene::IMesh *m : m_mesh) { +#if IRRLICHT_VERSION_MT_REVISION < 5 if (m_enable_vbo) { for (u32 i = 0; i < m->getMeshBufferCount(); i++) { scene::IMeshBuffer *buf = m->getMeshBuffer(i); RenderingEngine::get_video_driver()->removeHardwareBuffer(buf); } } +#endif m->drop(); } delete m_minimap_mapblock; |