Skip to content

perf(radar): Reduce cost of W3DRadar::renderObjectList (by 80%), W3DRadar::buildTerrainTexture (by 25%) and W3DRadar::clearShroud #2138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 3 commits into from
Jan 20, 2026
Merged

perf(radar): Reduce cost of W3DRadar::renderObjectList (by 80%), W3DRadar::buildTerrainTexture (by 25%) and W3DRadar::clearShroud #2138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce17e59
perf(radar): Reduce cost of W3DRadar::renderObjectList (by 80%), W3DR…
xezon Jan 10, 2026
a4d6f91
Fix Get_Pixel
xezon Jan 17, 2026
aa64962
Add typedef for locked surface
xezon Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Core/GameEngine/Source/GameClient/MapUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,19 +1290,23 @@ Bool parseMapPreviewChunk(DataChunkInput &file, DataChunkInfo *info, void *userD
//texture->Get_Surface_Level();

DEBUG_LOG(("BeginMapPreviewInfo"));
int pitch;
void *pBits = surface->Lock(&pitch);
const unsigned int bytesPerPixel = surface->Get_Bytes_Per_Pixel();
UnsignedInt *buffer = new UnsignedInt[size.x * size.y];
Int x,y;
for (y=0; y<size.y; y++) {
for(x = 0; x< size.x; x++)
{
surface->DrawPixel( x, y, file.readInt() );
surface->Draw_Pixel( x, y, file.readInt(), bytesPerPixel, pBits, pitch );
Comment thread
xezon marked this conversation as resolved.
buffer[y + x] = file.readInt();
Comment thread
xezon marked this conversation as resolved.
DEBUG_LOG(("x:%d, y:%d, %X", x, y, buffer[y + x]));
}
}
mapPreviewImage->setRawTextureData(buffer);
DEBUG_ASSERTCRASH(file.atEndOfChunk(), ("Unexpected data left over."));
DEBUG_LOG(("EndMapPreviewInfo"));
surface->Unlock();
REF_PTR_RELEASE(surface);
return true;
*/
Expand Down
98 changes: 56 additions & 42 deletions Core/GameEngineDevice/Source/W3DDevice/Common/System/W3DRadar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ void W3DRadar::deleteResources( void )
deleteInstance(m_shroudImage);
m_shroudImage = nullptr;

DEBUG_ASSERTCRASH(m_shroudSurface == NULL, ("W3DRadar::deleteResources: m_shroudSurface is expected NULL"));
DEBUG_ASSERTCRASH(m_shroudSurfaceBits == NULL, ("W3DRadar::deleteResources: m_shroudSurfaceBits is expected NULL"));
DEBUG_ASSERTCRASH(m_shroudSurface == nullptr, ("W3DRadar::deleteResources: m_shroudSurface is expected null"));
DEBUG_ASSERTCRASH(m_shroudSurfaceBits == nullptr, ("W3DRadar::deleteResources: m_shroudSurfaceBits is expected null"));

}

Expand Down Expand Up @@ -697,6 +697,10 @@ void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *text

Player *player = rts::getObservedOrLocalPlayer();

int pitch;
void *pBits = surface->Lock(&pitch);
const unsigned int bytesPerPixel = surface->Get_Bytes_Per_Pixel();

for( const RadarObject *rObj = listHead; rObj; rObj = rObj->friend_getNext() )
{
if (!canRenderObject(rObj, player))
Expand Down Expand Up @@ -736,21 +740,23 @@ void W3DRadar::renderObjectList( const RadarObject *listHead, TextureClass *text

// draw the blip, but make sure the points are legal
if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
surface->DrawPixel( radarPoint.x, radarPoint.y, c );
surface->Draw_Pixel( radarPoint.x, radarPoint.y, c, bytesPerPixel, pBits, pitch );

radarPoint.y++;
if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
surface->DrawPixel( radarPoint.x, radarPoint.y, c );
surface->Draw_Pixel( radarPoint.x, radarPoint.y, c, bytesPerPixel, pBits, pitch );

radarPoint.x++;
if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
surface->DrawPixel( radarPoint.x, radarPoint.y, c );
surface->Draw_Pixel( radarPoint.x, radarPoint.y, c, bytesPerPixel, pBits, pitch );

radarPoint.y--;
if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
surface->DrawPixel( radarPoint.x, radarPoint.y, c );
surface->Draw_Pixel( radarPoint.x, radarPoint.y, c, bytesPerPixel, pBits, pitch );

}

surface->Unlock();
REF_PTR_RELEASE(surface);

}
Expand Down Expand Up @@ -1068,6 +1074,11 @@ void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )
ICoord2D radarPoint;
Coord3D worldPoint;
Bridge *bridge;

int pitch;
void *pBits = surface->Lock(&pitch);
const unsigned int bytesPerPixel = surface->Get_Bytes_Per_Pixel();

for( y = 0; y < m_textureHeight; y++ )
{

Expand Down Expand Up @@ -1253,25 +1264,17 @@ void W3DRadar::buildTerrainTexture( TerrainLogic *terrain )

}

//
// draw the pixel for the terrain at this point, note that because of the orientation
// of our world we draw it with positive y in the "up" direction
//
// FYI: I tried making this faster by pulling out all the code inside DrawPixel
// and locking only once ... but it made absolutely *no* performance difference,
// the sampling and interpolation algorithm for generating pretty looking terrain
// and water for the radar is just, well, expensive.
//
surface->DrawPixel( x, y, GameMakeColor( color.red * 255,
color.green * 255,
color.blue * 255,
255 ) );
Color pixelColor = GameMakeColor( color.red * 255, color.green * 255, color.blue * 255, 255 );
surface->Draw_Pixel( x, y, pixelColor, bytesPerPixel, pBits, pitch );

}

}

// all done with the surface
surface->Unlock();
REF_PTR_RELEASE(surface);

}
Expand All @@ -1288,11 +1291,18 @@ void W3DRadar::clearShroud()
SurfaceClass *surface = m_shroudTexture->Get_Surface_Level();

// fill to clear, shroud will make black. Don't want to make something black that logic can't clear
unsigned int color = GameMakeColor( 0, 0, 0, 0 );

int pitch;
void *pBits = surface->Lock(&pitch);
const unsigned int bytesPerPixel = surface->Get_Bytes_Per_Pixel();
const Color color = GameMakeColor( 0, 0, 0, 0 );

for( Int y = 0; y < m_textureHeight; y++ )
{
surface->DrawHLine(y, 0, m_textureWidth-1, color);
surface->Draw_H_Line(y, 0, m_textureWidth-1, color, bytesPerPixel, pBits, pitch);
}

surface->Unlock();
REF_PTR_RELEASE(surface);
}

Expand Down Expand Up @@ -1346,51 +1356,49 @@ void W3DRadar::setShroudLevel(Int shroudX, Int shroudY, CellShroudStatus setting
else
alpha = 0;

if (m_shroudSurface == NULL)
if (m_shroudSurface == nullptr)
{
// This is expensive.
SurfaceClass* surface = m_shroudTexture->Get_Surface_Level();
DEBUG_ASSERTCRASH( surface, ("W3DRadar: Can't get surface for Shroud texture") );
int pitch;
void *pBits = surface->Lock(&pitch);
const unsigned int bytesPerPixel = surface->Get_Bytes_Per_Pixel();
const Color color = GameMakeColor( 0, 0, 0, alpha );

for( Int y = radarMinY; y <= radarMaxY; y++ )
for( Int y = radarMinY; y <= radarMaxY; ++y )
{
for( Int x = radarMinX; x <= radarMaxX; x++ )
for( Int x = radarMinX; x <= radarMaxX; ++x )
{
surface->DrawPixel( x, y, GameMakeColor( 0, 0, 0, alpha ) );
surface->Draw_Pixel( x, y, color, bytesPerPixel, pBits, pitch );
}
}

surface->Unlock();
REF_PTR_RELEASE(surface);
}
else
{
// This is cheap.
DEBUG_ASSERTCRASH(m_shroudSurfaceBits != NULL, ("W3DRadar::setShroudLevel: m_shroudSurfaceBits is not expected NULL"));
DEBUG_ASSERTCRASH(m_shroudSurfaceBits != nullptr, ("W3DRadar::setShroudLevel: m_shroudSurfaceBits is not expected null"));
DEBUG_ASSERTCRASH(m_shroudSurfacePixelSize != 0, ("W3DRadar::setShroudLevel: m_shroudSurfacePixelSize is not expected 0"));
const Color color = GameMakeColor( 0, 0, 0, alpha );

for( Int y = radarMinY; y <= radarMaxY; ++y )
{
UnsignedByte* row = static_cast<UnsignedByte*>(m_shroudSurfaceBits) + y * m_shroudSurfacePitch;
for( Int x = radarMinX; x <= radarMaxX; ++x )
{
UnsignedByte* column = row + x * m_shroudSurfacePixelSize;

switch (m_shroudSurfacePixelSize)
{
case 1: *column = (UnsignedByte)(color & 0xFF); break;
case 2: *reinterpret_cast<UnsignedShort*>(column) = (UnsignedShort)(color & 0xFFFF); break;
case 4: *reinterpret_cast<UnsignedInt*>(column) = (UnsignedInt)color; break;
}
m_shroudSurface->Draw_Pixel( x, y, color, m_shroudSurfacePixelSize, m_shroudSurfaceBits, m_shroudSurfacePitch );
}
}
}
}

void W3DRadar::beginSetShroudLevel()
{
DEBUG_ASSERTCRASH( m_shroudSurface == NULL, ("W3DRadar::beginSetShroudLevel: m_shroudSurface is expected NULL") );
DEBUG_ASSERTCRASH( m_shroudSurface == nullptr, ("W3DRadar::beginSetShroudLevel: m_shroudSurface is expected null") );
m_shroudSurface = m_shroudTexture->Get_Surface_Level();
DEBUG_ASSERTCRASH( m_shroudSurface != NULL, ("W3DRadar::beginSetShroudLevel: Can't get surface for Shroud texture") );
DEBUG_ASSERTCRASH( m_shroudSurface != nullptr, ("W3DRadar::beginSetShroudLevel: Can't get surface for Shroud texture") );

SurfaceClass::SurfaceDescription sd;
m_shroudSurface->Get_Description(sd);
Expand All @@ -1400,11 +1408,11 @@ void W3DRadar::beginSetShroudLevel()

void W3DRadar::endSetShroudLevel()
{
DEBUG_ASSERTCRASH( m_shroudSurface != NULL, ("W3DRadar::endSetShroudLevel: m_shroudSurface is not expected NULL") );
if (m_shroudSurfaceBits != NULL)
DEBUG_ASSERTCRASH( m_shroudSurface != nullptr, ("W3DRadar::endSetShroudLevel: m_shroudSurface is not expected null") );
if (m_shroudSurfaceBits != nullptr)
{
m_shroudSurface->Unlock();
m_shroudSurfaceBits = NULL;
m_shroudSurfaceBits = nullptr;
m_shroudSurfacePitch = 0;
m_shroudSurfacePixelSize = 0;
}
Expand Down Expand Up @@ -1555,6 +1563,10 @@ void W3DRadar::refreshObjects()

UnsignedByte minAlpha = 8;

int pitch;
void *pBits = surface->Lock(&pitch);
const unsigned int bytesPerPixel = surface->Get_Bytes_Per_Pixel();

for( const RadarObject *rObj = listHead; rObj; rObj = rObj->friend_getNext() )
{
UnsignedByte h = (UnsignedByte)(rObj->isTemporarilyHidden());
Expand Down Expand Up @@ -1639,24 +1651,26 @@ void W3DRadar::refreshObjects()

// draw the blip, but make sure the points are legal
if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
surface->DrawPixel( radarPoint.x, radarPoint.y, c );
surface->Draw_Pixel( radarPoint.x, radarPoint.y, c, bytesPerPixel, pBits, pitch );

radarPoint.x++;
if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
surface->DrawPixel( radarPoint.x, radarPoint.y, c );
surface->Draw_Pixel( radarPoint.x, radarPoint.y, c, bytesPerPixel, pBits, pitch );

radarPoint.y++;
if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
surface->DrawPixel( radarPoint.x, radarPoint.y, c );
surface->Draw_Pixel( radarPoint.x, radarPoint.y, c, bytesPerPixel, pBits, pitch );

radarPoint.x--;
if( legalRadarPoint( radarPoint.x, radarPoint.y ) )
surface->DrawPixel( radarPoint.x, radarPoint.y, c );
surface->Draw_Pixel( radarPoint.x, radarPoint.y, c, bytesPerPixel, pBits, pitch );




}

surface->Unlock();
REF_PTR_RELEASE(surface);

}
Expand Down
18 changes: 15 additions & 3 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,11 @@ void WaterRenderObjClass::ReAcquireResources(void)
if (m_whiteTexture && !m_whiteTexture->Is_Initialized())
{ m_whiteTexture->Init();
SurfaceClass *surface=m_whiteTexture->Get_Surface_Level();
surface->DrawPixel(0,0,0xffffffff);
int pitch;
void *pBits = surface->Lock(&pitch);
const unsigned int bytesPerPixel = surface->Get_Bytes_Per_Pixel();
surface->Draw_Pixel(0, 0, 0xffffffff, bytesPerPixel, pBits, pitch);
surface->Unlock();
REF_PTR_RELEASE(surface);
}
}
Expand Down Expand Up @@ -1111,7 +1115,11 @@ Int WaterRenderObjClass::init(Real waterLevel, Real dx, Real dy, SceneClass *par
//For some reason setting a null texture does not result in 0xffffffff for pixel shaders so using explicit "white" texture.
m_whiteTexture=MSGNEW("TextureClass") TextureClass(1,1,WW3D_FORMAT_A4R4G4B4,MIP_LEVELS_1);
SurfaceClass *surface=m_whiteTexture->Get_Surface_Level();
surface->DrawPixel(0,0,0xffffffff);
int pitch;
void *pBits = surface->Lock(&pitch);
const unsigned int bytesPerPixel = surface->Get_Bytes_Per_Pixel();
surface->Draw_Pixel(0, 0, 0xffffffff, bytesPerPixel, pBits, pitch);
surface->Unlock();
REF_PTR_RELEASE(surface);

m_waterNoiseTexture=WW3DAssetManager::Get_Instance()->Get_Texture("Noise0000.tga");
Expand Down Expand Up @@ -2961,7 +2969,11 @@ void WaterRenderObjClass::setupFlatWaterShader(void)
if (!m_whiteTexture->Is_Initialized())
{ m_whiteTexture->Init();
SurfaceClass *surface=m_whiteTexture->Get_Surface_Level();
surface->DrawPixel(0,0,0xffffffff);
int pitch;
void *pBits = surface->Lock(&pitch);
const unsigned int bytesPerPixel = surface->Get_Bytes_Per_Pixel();
surface->Draw_Pixel(0, 0, 0xffffffff, bytesPerPixel, pBits, pitch);
surface->Unlock();
REF_PTR_RELEASE(surface);
}
DX8Wrapper::_Get_D3D_Device8()->SetTexture(3,m_whiteTexture->Peek_D3D_Texture());
Expand Down
Loading
Loading