bugfix(heightmap): Revert optimization for m_vertexBufferTiles in HeightMapRenderObjClass because it does not work properly (TheSuperHackers#2135)

Author: xezon

Core/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h

@@ -49,7 +49,7 @@ virtually everything to do with the terrain, including: drawing, lighting,
 scorchmarks and intersection tests.
 
 TheSuperHackers @performance xezon 13/01/2026
-Class now stores the vertex buffers as one big buffer each for optimal data locality.
+Class now stores the vertex buffer backup as one big array for optimal data locality.
 */
 class HeightMapRenderObjClass : public BaseHeightMapRenderObjClass
 {
@@ -89,7 +89,7 @@ class HeightMapRenderObjClass : public BaseHeightMapRenderObjClass
 	Int m_numExtraBlendTiles;		///<number of blend tiles in m_extraBlendTilePositions.
 	Int	m_numVisibleExtraBlendTiles; ///<number rendered last frame.
 	Int m_extraBlendTilePositionsSize; //<total size of array including unused memory.
-	DX8VertexBufferClass *m_vertexBufferTiles;	///<collection of smaller vertex buffers that make up 1 heightmap
+	DX8VertexBufferClass **m_vertexBufferTiles; ///<collection of smaller vertex buffers that make up 1 heightmap
 	VERTEX_FORMAT *m_vertexBufferBackup; ///< In memory copy of the vertex buffer data for quick update of dynamic lighting.
 	Int m_originX; ///<  Origin point in the grid.  Slides around.
 	Int m_originY; ///< Origin point in the grid.  Slides around.

Core/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp

@@ -126,12 +126,12 @@ void HeightMapRenderObjClass::freeIndexVertexBuffers(void)
 {
 	REF_PTR_RELEASE(m_indexBuffer);
 
-	for (Int i=0; i<m_numVertexBufferTiles; ++i)
-	{
-		(m_vertexBufferTiles + i)->~DX8VertexBufferClass();
+	if (m_vertexBufferTiles) {
+		for (int i=0; i<m_numVertexBufferTiles; i++)
+			REF_PTR_RELEASE(m_vertexBufferTiles[i]);
+		delete[] m_vertexBufferTiles;
+		m_vertexBufferTiles = nullptr;
 	}
-	::operator delete(m_vertexBufferTiles);
-	m_vertexBufferTiles = nullptr;
 
 	delete[] m_vertexBufferBackup;
 	m_vertexBufferBackup = nullptr;
@@ -156,7 +156,7 @@ Int HeightMapRenderObjClass::freeMapResources(void)
 
 DX8VertexBufferClass *HeightMapRenderObjClass::getVertexBufferTile(Int x, Int y)
 {
-	return m_vertexBufferTiles + y*m_numVBTilesX+x;
+	return m_vertexBufferTiles[y*m_numVBTilesX+x];
 }
 
 //=============================================================================
@@ -1321,14 +1321,14 @@ Int HeightMapRenderObjClass::initHeightData(Int x, Int y, WorldHeightMap *pMap,
 		m_x=x;
 		m_y=y;
 
-		m_vertexBufferTiles = (DX8VertexBufferClass*)::operator new(m_numVertexBufferTiles * sizeof(DX8VertexBufferClass));
+		m_vertexBufferTiles = NEW DX8VertexBufferClass*[m_numVertexBufferTiles];
 		m_vertexBufferBackup = NEW VERTEX_FORMAT [m_numVertexBufferTiles * HEIGHTMAP_VERTEX_NUM];
 
 		for (i=0; i<m_numVertexBufferTiles; i++) {
 #ifdef USE_NORMALS
-			new (&m_vertexBufferTiles[i]) DX8VertexBufferClass(DX8_FVF_XYZNUV2,HEIGHTMAP_VERTEX_NUM,DX8VertexBufferClass::USAGE_DEFAULT);
+			m_vertexBufferTiles[i] = NEW_REF(DX8VertexBufferClass,(DX8_FVF_XYZNUV2,HEIGHTMAP_VERTEX_NUM,DX8VertexBufferClass::USAGE_DEFAULT));
 #else
-			new (&m_vertexBufferTiles[i]) DX8VertexBufferClass(DX8_VERTEX_FORMAT,HEIGHTMAP_VERTEX_NUM,DX8VertexBufferClass::USAGE_DEFAULT);
+			m_vertexBufferTiles[i] = NEW_REF(DX8VertexBufferClass,(DX8_VERTEX_FORMAT,HEIGHTMAP_VERTEX_NUM,DX8VertexBufferClass::USAGE_DEFAULT));
 #endif
 		}
 
@@ -2013,7 +2013,7 @@ void HeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
 		for (j=0; j<m_numVBTilesY; j++)
 			for (i=0; i<m_numVBTilesX; i++)
 			{
-				DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferTiles + j*m_numVBTilesX+i);
+				DX8Wrapper::Set_Vertex_Buffer(getVertexBufferTile(i, j));
 #ifdef PRE_TRANSFORM_VERTEX
 				if (m_xformedVertexBuffer && pass==0) {
 					// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.
@@ -2143,7 +2143,7 @@ void HeightMapRenderObjClass::renderTerrainPass(CameraClass *pCamera)
 	for (Int j=0; j<m_numVBTilesY; j++)
 		for (Int i=0; i<m_numVBTilesX; i++)
 		{
-			DX8Wrapper::Set_Vertex_Buffer(m_vertexBufferTiles + j*m_numVBTilesX+i);
+			DX8Wrapper::Set_Vertex_Buffer(getVertexBufferTile(i, j));
 #ifdef PRE_TRANSFORM_VERTEX
 			if (m_xformedVertexBuffer && pass==0) {
 				// Note - m_xformedVertexBuffer should only be used for non T&L hardware.  jba.

Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h

@@ -196,13 +196,12 @@ inline VertexFormatXYZNDUV2 * DynamicVBAccessClass::WriteLockClass::Get_Formatte
 /**
 ** DX8VertexBufferClass
 ** This class wraps a DX8 vertex buffer.  Use the lock objects to modify or append to the vertex buffer.
-**
-** TheSuperHackers @performance Allow placement new and bypass the W3DMemPool to create big buffers.
 */
 class DX8VertexBufferClass : public VertexBufferClass
 {
 	W3DMPO_GLUE(DX8VertexBufferClass)
-
+protected:
+	~DX8VertexBufferClass();
 public:
 	enum UsageType {
 		USAGE_DEFAULT=0,
@@ -211,15 +210,11 @@ class DX8VertexBufferClass : public VertexBufferClass
 		USAGE_NPATCHES=4
 	};
 
-	void* operator new(size_t s, void* placement) noexcept { return placement; }
-	void operator delete(void* p, void* placement) noexcept {}
-
 	DX8VertexBufferClass(unsigned FVF, unsigned short VertexCount, UsageType usage=USAGE_DEFAULT);
 	DX8VertexBufferClass(const Vector3* vertices, const Vector3* normals, const Vector2* tex_coords, unsigned short VertexCount,UsageType usage=USAGE_DEFAULT);
 	DX8VertexBufferClass(const Vector3* vertices, const Vector3* normals, const Vector4* diffuse, const Vector2* tex_coords, unsigned short VertexCount,UsageType usage=USAGE_DEFAULT);
 	DX8VertexBufferClass(const Vector3* vertices, const Vector4* diffuse, const Vector2* tex_coords, unsigned short VertexCount,UsageType usage=USAGE_DEFAULT);
 	DX8VertexBufferClass(const Vector3* vertices, const Vector2* tex_coords, unsigned short VertexCount,UsageType usage=USAGE_DEFAULT);
-	~DX8VertexBufferClass();
 
 	IDirect3DVertexBuffer8* Get_DX8_Vertex_Buffer() { return VertexBuffer; }
 

Generals/Code/Tools/WorldBuilder/src/WBHeightMap.cpp

@@ -88,13 +88,10 @@ void WBHeightMap::flattenHeights(void) {
 	for (j=0; j<m_numVBTilesY; j++)
 		for (i=0; i<m_numVBTilesX; i++)
 		{
-			static int count = 0;
-			count++;
-			Int numVertex = (VERTEX_BUFFER_TILE_LENGTH*2)*(VERTEX_BUFFER_TILE_LENGTH*2);
-			DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexBufferTiles + j*m_numVBTilesX+i);
+			DX8VertexBufferClass::WriteLockClass lockVtxBuffer(getVertexBufferTile(i, j));
 			VERTEX_FORMAT *vbHardware = (VERTEX_FORMAT*)lockVtxBuffer.Get_Vertex_Array();
 			Int vtx;
-			for (vtx=0; vtx<numVertex; vtx++) {
+			for (vtx=0; vtx<HEIGHTMAP_VERTEX_NUM; vtx++) {
 				vbHardware->z = theZ;
 				vbHardware++;
 			}

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h

@@ -197,13 +197,12 @@ inline VertexFormatXYZNDUV2 * DynamicVBAccessClass::WriteLockClass::Get_Formatte
 /**
 ** DX8VertexBufferClass
 ** This class wraps a DX8 vertex buffer.  Use the lock objects to modify or append to the vertex buffer.
-**
-** TheSuperHackers @performance Allow placement new and bypass the W3DMemPool to create big buffers.
 */
 class DX8VertexBufferClass : public VertexBufferClass
 {
 	W3DMPO_GLUE(DX8VertexBufferClass)
-
+protected:
+	~DX8VertexBufferClass();
 public:
 	enum UsageType {
 		USAGE_DEFAULT=0,
@@ -212,15 +211,11 @@ class DX8VertexBufferClass : public VertexBufferClass
 		USAGE_NPATCHES=4
 	};
 
-	void* operator new(size_t s, void* placement) noexcept { return placement; }
-	void operator delete(void* p, void* placement) noexcept {}
-
 	DX8VertexBufferClass(unsigned FVF, unsigned short VertexCount, UsageType usage=USAGE_DEFAULT, unsigned vertex_size=0); // Vertex size not used with FVF formats
 	DX8VertexBufferClass(const Vector3* vertices, const Vector3* normals, const Vector2* tex_coords, unsigned short VertexCount,UsageType usage=USAGE_DEFAULT);
 	DX8VertexBufferClass(const Vector3* vertices, const Vector3* normals, const Vector4* diffuse, const Vector2* tex_coords, unsigned short VertexCount,UsageType usage=USAGE_DEFAULT);
 	DX8VertexBufferClass(const Vector3* vertices, const Vector4* diffuse, const Vector2* tex_coords, unsigned short VertexCount,UsageType usage=USAGE_DEFAULT);
 	DX8VertexBufferClass(const Vector3* vertices, const Vector2* tex_coords, unsigned short VertexCount,UsageType usage=USAGE_DEFAULT);
-	~DX8VertexBufferClass();
 
 	IDirect3DVertexBuffer8* Get_DX8_Vertex_Buffer() { return VertexBuffer; }