From a8e7e261b941e908abc652eac099fc341713be39 Mon Sep 17 00:00:00 2001
From: Gregor Parzefall <gregor.parzefall@posteo.de>
Date: Thu, 12 Sep 2024 19:28:37 +0200
Subject: [PATCH] Revert "Set VBO hints in more places"

---
 src/client/content_cao.cpp          | 12 ------------
 src/client/hud.cpp                  |  1 -
 src/client/minimap.cpp              |  1 -
 src/irrlicht_changes/CGUITTFont.cpp |  1 -
 4 files changed, 15 deletions(-)

diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
index f67e57056..0df6d74a3 100644
--- a/src/client/content_cao.cpp
+++ b/src/client/content_cao.cpp
@@ -817,18 +817,6 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 				<<"\" not supported"<<std::endl;
 	}
 
-	/* Set VBO hint */
-	// - if shaders are disabled we modify the mesh often
-	// - sprites are also modified often
-	// - the wieldmesh sets its own hint
-	// - bone transformations do not need to modify the vertex data
-	if (m_enable_shaders && (m_meshnode || m_animated_meshnode)) {
-		if (m_meshnode)
-			m_meshnode->getMesh()->setHardwareMappingHint(scene::EHM_STATIC);
-		if (m_animated_meshnode)
-			m_animated_meshnode->getMesh()->setHardwareMappingHint(scene::EHM_STATIC);
-	}
-
 	/* don't update while punch texture modifier is active */
 	if (m_reset_textures_timer < 0)
 		updateTextures(m_current_texture_modifier);
diff --git a/src/client/hud.cpp b/src/client/hud.cpp
index 73f3bee02..11f9cbd5c 100644
--- a/src/client/hud.cpp
+++ b/src/client/hud.cpp
@@ -139,7 +139,6 @@ Hud::Hud(Client *client, LocalPlayer *player,
 
 	m_rotation_mesh_buffer.getMaterial().Lighting = false;
 	m_rotation_mesh_buffer.getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
-	//m_rotation_mesh_buffer.setHardwareMappingHint(scene::EHM_STATIC); // FIXME: incorrectly stack allocated, not safe!
 }
 
 void Hud::readScalingSetting()
diff --git a/src/client/minimap.cpp b/src/client/minimap.cpp
index afac89843..b7e4a78e6 100644
--- a/src/client/minimap.cpp
+++ b/src/client/minimap.cpp
@@ -571,7 +571,6 @@ scene::SMeshBuffer *Minimap::getMinimapMeshBuffer()
 	buf->Indices[4] = 3;
 	buf->Indices[5] = 0;
 
-	buf->setHardwareMappingHint(scene::EHM_STATIC);
 	return buf;
 }
 
diff --git a/src/irrlicht_changes/CGUITTFont.cpp b/src/irrlicht_changes/CGUITTFont.cpp
index 40d2bb405..9274ee69f 100644
--- a/src/irrlicht_changes/CGUITTFont.cpp
+++ b/src/irrlicht_changes/CGUITTFont.cpp
@@ -1046,7 +1046,6 @@ void CGUITTFont::createSharedPlane()
 	buf->append(vertices, 4, indices, 6);
 
 	shared_plane_.addMeshBuffer( buf );
-	shared_plane_.setHardwareMappingHint(EHM_STATIC);
 
 	shared_plane_ptr_ = &shared_plane_;
 	buf->drop(); //the addMeshBuffer method will grab it, so we can drop this ptr.