ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS: Fix overflow calculation from errantly going off.

This commit is contained in:
refractionpcsx2 2022-06-15 05:54:54 +01:00
parent 59ea3c7949
commit fb5b465a4e
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcsx2/GS/GSState.cpp
View File

@ -3792,7 +3792,6 @@ GIFRegTEX0 GSState::GetTex0Layer(u32 lod)
GSState::GSTransferBuffer::GSTransferBuffer() GSState::GSTransferBuffer::GSTransferBuffer()
{ {
x = y = 0; x = y = 0;
overflow = false;
start = end = total = 0; start = end = total = 0;
constexpr size_t alloc_size = 1024 * 1024 * 4; constexpr size_t alloc_size = 1024 * 1024 * 4;
@ -3814,24 +3813,21 @@ void GSState::GSTransferBuffer::Init(int tx, int ty, const GIFRegBITBLTBUF& blit
bool GSState::GSTransferBuffer::Update(int tw, int th, int bpp, int& len) bool GSState::GSTransferBuffer::Update(int tw, int th, int bpp, int& len)
{ {
u32 packet_size = 0; int tex_size = (((tw * th * bpp) + 7) >> 3); // Round to nearest byte
u32 tex_size = 0; int packet_size = (tex_size + 15) & ~0xF; // Round up to the nearest quadword
if (total == 0) if (total == 0)
{ {
start = end = 0; start = end = 0;
tex_size = (((tw * th * bpp) + 7) >> 3);
packet_size = (tex_size + 15) & ~0xF; // Round up to the nearest quadword
total = std::min<int>(tex_size, 1024 * 1024 * 4); total = std::min<int>(tex_size, 1024 * 1024 * 4);
overflow = false;
} }
const int remaining = total - end; const int remaining = total - end;
if (len > remaining) if (len > remaining)
{ {
if (!overflow && len > packet_size) if (len > packet_size)
{ {
overflow = true;
#if defined(PCSX2_DEVBUILD) || defined(_DEBUG) #if defined(PCSX2_DEVBUILD) || defined(_DEBUG)
Console.Warning("GS transfer buffer overflow len %d remaining %d, tex_size %d tw %d th %d bpp %d", len, remaining, tex_size, tw, th, bpp); Console.Warning("GS transfer buffer overflow len %d remaining %d, tex_size %d tw %d th %d bpp %d", len, remaining, tex_size, tw, th, bpp);
#endif #endif

1
pcsx2/GS/GSState.h
View File

@ -132,7 +132,6 @@ class GSState : public GSAlignedClass<32>
{ {
int x, y; int x, y;
int start, end, total; int start, end, total;
bool overflow;
u8* buff; u8* buff;
GIFRegBITBLTBUF m_blit; GIFRegBITBLTBUF m_blit;