mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-10-09 10:39:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid overflow in silhouette occluder bounds

Browse Source 
This triggered a debug_warn in some cases.
This commit is contained in:
Lancelot de Ferrière
2025-04-06 12:45:41 +02:00
parent 2264807ad0
commit 8a40673dab
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/renderer/SilhouetteRenderer.cpp
+8 -5
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2023 Wildfire Games. /* Copyright (C) 2025 Wildfire Games.
* This file is part of 0 A.D. * This file is part of 0 A.D.
* *
* 0 A.D. is free software: you can redistribute it and/or modify * 0 A.D. is free software: you can redistribute it and/or modify
@@ -180,10 +180,13 @@ static void ComputeScreenBounds(Occluder& occluder, const CBoundingBoxAligned& b
for (size_t iz = 0; iz <= 1; ++iz) for (size_t iz = 0; iz <= 1; ++iz)
{ {
CVector4D svec = proj.Transform(CVector4D(bounds[ix].X, bounds[iy].Y, bounds[iz].Z, 1.0f)); CVector4D svec = proj.Transform(CVector4D(bounds[ix].X, bounds[iy].Y, bounds[iz].Z, 1.0f));
x0 = std::min(x0, static_cast<u16>(g_HalfMaxCoord + static_cast<u16>(g_HalfMaxCoord * svec.X / svec.W))); // Avoid overflows
y0 = std::min(y0, static_cast<u16>(g_HalfMaxCoord + static_cast<u16>(g_HalfMaxCoord * svec.Y / svec.W))); u16 svx = g_HalfMaxCoord + static_cast<u16>(Clamp(g_HalfMaxCoord * svec.X / svec.W, 0.f, static_cast<float>(g_MaxCoord - 1)));
x1 = std::max(x1, static_cast<u16>(g_HalfMaxCoord + static_cast<u16>(g_HalfMaxCoord * svec.X / svec.W))); u16 svy = g_HalfMaxCoord + static_cast<u16>(Clamp(g_HalfMaxCoord * svec.Y / svec.W, 0.f, static_cast<float>(g_MaxCoord - 1)));
y1 = std::max(y1, static_cast<u16>(g_HalfMaxCoord + static_cast<u16>(g_HalfMaxCoord * svec.Y / svec.W))); x0 = std::min(x0, svx);
y0 = std::min(y0, svy);
x1 = std::max(x1, svx);
y1 = std::max(y1, svy);
z0 = std::min(z0, svec.Z / svec.W); z0 = std::min(z0, svec.Z / svec.W);
} }
} }