diff --git a/pcsx2/GS/GSLzma.cpp b/pcsx2/GS/GSLzma.cpp index 1bec66831f..9dc2c2ef14 100644 --- a/pcsx2/GS/GSLzma.cpp +++ b/pcsx2/GS/GSLzma.cpp @@ -24,8 +24,8 @@ using namespace GSDumpTypes; GSDumpFile::GSDumpFile(FILE* file, FILE* repack_file) - : m_repack_fp(repack_file) - , m_fp(file) + : m_fp(file) + , m_repack_fp(repack_file) { } diff --git a/pcsx2/GS/GSLzma.h b/pcsx2/GS/GSLzma.h index 37c93ee264..99f79884e9 100644 --- a/pcsx2/GS/GSLzma.h +++ b/pcsx2/GS/GSLzma.h @@ -292,7 +292,7 @@ public: { GSDumpTypes::GSType id; const u8* data; - s32 length; + size_t length; GSDumpTypes::GSTransferPath path; }; diff --git a/pcsx2/GS/GSState.cpp b/pcsx2/GS/GSState.cpp index db53801f3d..3be72d2735 100644 --- a/pcsx2/GS/GSState.cpp +++ b/pcsx2/GS/GSState.cpp @@ -404,7 +404,6 @@ GSVector4i GSState::GetFrameMagnifiedRect(int i) height = (DH / (VideoModeDividers[(int)videomode - 1].y + 1)); } - const auto& SMODE2 = m_regs->SMODE2; int res_multi = 1; if (isinterlaced() && m_regs->SMODE2.FFMD && height > 1) @@ -471,8 +470,6 @@ GSVector2i GSState::GetResolutionOffset(int i) GSVector2i GSState::GetResolution() { const GSVideoMode videomode = GetVideoMode(); - const auto& SMODE2 = m_regs->SMODE2; - const int res_multi = (SMODE2.INT + 1); const bool ignore_offset = !GSConfig.PCRTCOffsets; GSVector2i resolution(VideoModeOffsets[(int)videomode - 1].x, VideoModeOffsets[(int)videomode - 1].y); @@ -1629,6 +1626,7 @@ void GSState::FlushPrim() case GS_SPRITE: unused = 1; buff[0] = m_vertex.buff[tail - 1]; + break; case GS_TRIANGLELIST: case GS_TRIANGLESTRIP: unused = std::min(tail - head, 2); @@ -2677,6 +2675,7 @@ __forceinline void GSState::HandleAutoFlush() switch (GSUtil::GetPrimClass(PRIM->PRIM)) { case GS_POINT_CLASS: + case GS_INVALID_CLASS: n = 1; break; case GS_LINE_CLASS: @@ -3071,7 +3070,7 @@ static bool UsesRegionRepeat(int fix, int msk, int min, int max, int* min_out, i // The true minimum value is `min` with all bits below the most significant replaced variable `0` bit cleared const int min_overwritten_variable_zeros = ~min & overwritten_variable_bits; if (_BitScanReverse(&msb, min_overwritten_variable_zeros)) - min &= (~0 << msb); + min &= (~0u << msb); // Similar thing for max, but the first masked `1` bit const int max_overwritten_variable_ones = max & overwritten_variable_bits; if (_BitScanReverse(&msb, max_overwritten_variable_ones)) diff --git a/pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.all.cpp b/pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.all.cpp index 5d95924a62..0093e7419d 100644 --- a/pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.all.cpp +++ b/pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.all.cpp @@ -2088,7 +2088,6 @@ void GSDrawScanlineCodeGenerator2::AlphaTFX() const XYm& f_ga = _f_ga; const XYm& tmpga = xym1; const XYm& tmp = xym0; - Address _32_gaptr = m_sel.iip ? _rip_local(temp.ga) : _rip_local(c.ga); switch (m_sel.tfx) {