Skip to content

ps1: gpu: Ensure hi >= lo when calling std::clamp() #1851

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ps1: gpu: Ensure hi >= lo when calling std::clamp() #1851

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 10 additions & 8 deletions ares/ps1/gpu/renderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#define clip(X, LO, HI) std::clamp((X), (((LO) <= (HI)) ? (LO) : (HI)), (((HI) >= (LO)) ? (HI) : (LO)))

auto GPU::generateTables() -> void {
static constexpr s8 table[4][4] = {
{-4, +0, -3, +1},
Expand Down Expand Up @@ -165,10 +167,10 @@ auto GPU::Render::line() -> void {
v0.x += drawingAreaOffsetX, v0.y += drawingAreaOffsetY;
v1.x += drawingAreaOffsetX, v1.y += drawingAreaOffsetY;

v0.x = std::clamp(v0.x, drawingAreaOriginX1, drawingAreaOriginX2);
v0.y = std::clamp(v0.y, drawingAreaOriginY1, drawingAreaOriginY2);
v1.x = std::clamp(v1.x, drawingAreaOriginX1, drawingAreaOriginX2);
v1.y = std::clamp(v1.y, drawingAreaOriginY1, drawingAreaOriginY2);
v0.x = clip(v0.x, drawingAreaOriginX1, drawingAreaOriginX2);
v0.y = clip(v0.y, drawingAreaOriginY1, drawingAreaOriginY2);
v1.x = clip(v1.x, drawingAreaOriginX1, drawingAreaOriginX2);
v1.y = clip(v1.y, drawingAreaOriginY1, drawingAreaOriginY2);

Point d = {v1.x - v0.x, v1.y - v0.y};
s32 steps = abs(d.x) > abs(d.y) ? abs(d.x) : abs(d.y);
Expand Down Expand Up @@ -215,10 +217,10 @@ auto GPU::Render::triangle() -> void {
if(vmax.x - vmin.x > 1024 || vmax.y - vmin.y > 512) return;

//clip rendering to drawing area
vmin.x = std::clamp(vmin.x, drawingAreaOriginX1, drawingAreaOriginX2);
vmin.y = std::clamp(vmin.y, drawingAreaOriginY1, drawingAreaOriginY2);
vmax.x = std::clamp(vmax.x, drawingAreaOriginX1, drawingAreaOriginX2);
vmax.y = std::clamp(vmax.y, drawingAreaOriginY1, drawingAreaOriginY2);
vmin.x = clip(vmin.x, drawingAreaOriginX1, drawingAreaOriginX2);
vmin.y = clip(vmin.y, drawingAreaOriginY1, drawingAreaOriginY2);
vmax.x = clip(vmax.x, drawingAreaOriginX1, drawingAreaOriginX2);
vmax.y = clip(vmax.y, drawingAreaOriginY1, drawingAreaOriginY2);

s32 area = weight(v0, v1, v2); //<0 = counter-clockwise; 0 = colinear, >0 = clockwise
if(area == 0) return; //do not render colinear triangles
Expand Down