thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-texture-scale-overflow-freeze' into 'master'

Browse source 
Prevent overflow when scaling textures

Closes #844

See merge request KartKrew/Kart!1879
This commit is contained in:
Eidolon 2024-01-29 00:27:37 +00:00
commit 83a32c5acc
1 changed files with 36 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/r_segs.cpp
View file

@ -11,6 +11,8 @@
/// \file r_segs.c
/// \brief All the clipping: columns, horizontal spans, sky columns
#include <limits>
#include <tracy/tracy/Tracy.hpp>
#include "command.h"
@ -717,16 +719,45 @@ void R_RenderMaskedSegRange(drawseg_t *drawseg, INT32 x1, INT32 x2)
R_SetColumnFunc(BASEDRAWFUNC, false);
}
template <typename T>
static constexpr T saturating_add(T x, T y) noexcept
{
INT64 z;
z = static_cast<INT64>(x) + static_cast<INT64>(y);
if (z > static_cast<INT64>(std::numeric_limits<T>::max()))
{
z = static_cast<INT64>(std::numeric_limits<T>::max());
}
else if (z < static_cast<INT64>(std::numeric_limits<T>::min()))
{
z = static_cast<INT64>(std::numeric_limits<T>::min());
}
return static_cast<T>(z);
}
template <typename T>
static constexpr T saturating_mul(T x, T y) noexcept
{
INT64 z;
z = static_cast<INT64>(x) * static_cast<INT64>(y);
if (z > static_cast<INT64>(std::numeric_limits<T>::max()))
{
z = static_cast<INT64>(std::numeric_limits<T>::max());
}
else if (z < static_cast<INT64>(std::numeric_limits<T>::min()))
{
z = static_cast<INT64>(std::numeric_limits<T>::min());
}
return static_cast<T>(z);
}
// Loop through R_DrawMaskedColumn calls
static void R_DrawRepeatMaskedColumn(drawcolumndata_t* dc, column_t *col, column_t *bm, INT32 baseclip)
{
while (sprtopscreen < sprbotscreen)
{
R_DrawMaskedColumn(dc, col, bm, baseclip);
if ((INT64)sprtopscreen + dc->texheight*spryscale > (INT64)INT32_MAX) // prevent overflow
sprtopscreen = INT32_MAX;
else
sprtopscreen += dc->texheight*spryscale;
sprtopscreen = saturating_add(sprtopscreen, saturating_mul(dc->texheight, spryscale));
}
}
@ -734,7 +765,7 @@ static void R_DrawRepeatFlippedMaskedColumn(drawcolumndata_t* dc, column_t *col,
{
do {
R_DrawFlippedMaskedColumn(dc, col, bm, baseclip);
sprtopscreen += dc->texheight*spryscale;
sprtopscreen = saturating_add(sprtopscreen, saturating_mul(dc->texheight, spryscale));
} while (sprtopscreen < sprbotscreen);
}