ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GPU: Fix crash when fill rectangles are out-of-bounds

This commit is contained in:
Connor McLaughlin 2020-03-21 00:15:35 +10:00
parent d67bcd654c
commit 904ab982e6
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/gpu.cpp
View File

@ -842,8 +842,27 @@ void GPU::ReadVRAM(u32 x, u32 y, u32 width, u32 height) {}
void GPU::FillVRAM(u32 x, u32 y, u32 width, u32 height, u32 color) void GPU::FillVRAM(u32 x, u32 y, u32 width, u32 height, u32 color)
{ {
const u16 color16 = RGBA8888ToRGBA5551(color); const u16 color16 = RGBA8888ToRGBA5551(color);
if ((x + width) <= VRAM_WIDTH)
{
for (u32 yoffs = 0; yoffs < height; yoffs++) for (u32 yoffs = 0; yoffs < height; yoffs++)
std::fill_n(&m_vram_ptr[((y + yoffs) * VRAM_WIDTH) + x], width, color16); {
const u32 row = (y + yoffs) % VRAM_HEIGHT;
std::fill_n(&m_vram_ptr[row * VRAM_WIDTH + x], width, color16);
}
}
else
{
for (u32 yoffs = 0; yoffs < height; yoffs++)
{
const u32 row = (y + yoffs) % VRAM_HEIGHT;
u16* row_ptr = &m_vram_ptr[row * VRAM_WIDTH];
for (u32 xoffs = 0; xoffs < width; xoffs++)
{
const u32 col = (x + xoffs) % VRAM_WIDTH;
row_ptr[col] = color16;
}
}
}
} }
void GPU::UpdateVRAM(u32 x, u32 y, u32 width, u32 height, const void* data) void GPU::UpdateVRAM(u32 x, u32 y, u32 width, u32 height, const void* data)