From 153b492a7902cf7ffb767f8b8cc81fb8c03b11d4 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sat, 8 Jun 2024 22:59:29 +1000 Subject: [PATCH] GS: Remove unordered runion() We're working with rectangles everywhere. --- pcsx2/GS/GSState.cpp | 2 +- pcsx2/GS/GSVector4i.h | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/pcsx2/GS/GSState.cpp b/pcsx2/GS/GSState.cpp index 69683240d1..17acb57ae8 100644 --- a/pcsx2/GS/GSState.cpp +++ b/pcsx2/GS/GSState.cpp @@ -2939,7 +2939,7 @@ GSState::PRIM_OVERLAP GSState::PrimitiveOverlap() if (all.rintersect(sprite).rempty()) { - all = all.runion_ordered(sprite); + all = all.runion(sprite); } else { diff --git a/pcsx2/GS/GSVector4i.h b/pcsx2/GS/GSVector4i.h index 2c4ac6748c..5037706a32 100644 --- a/pcsx2/GS/GSVector4i.h +++ b/pcsx2/GS/GSVector4i.h @@ -168,28 +168,6 @@ public: } __forceinline GSVector4i runion(const GSVector4i& a) const - { - int i = (upl64(a) < uph64(a)).mask(); - - if (i == 0xffff) - { - return runion_ordered(a); - } - - if ((i & 0x00ff) == 0x00ff) - { - return *this; - } - - if ((i & 0xff00) == 0xff00) - { - return a; - } - - return GSVector4i::zero(); - } - - __forceinline GSVector4i runion_ordered(const GSVector4i& a) const { return min_i32(a).upl64(max_i32(a).srl<8>()); }