Citra-emu/hwtests
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed accessing uninitialized memory in the memory fill tests.

Browse Source 
Flush and invalidate the right amount of bytes during each memory transfer test.
This commit is contained in:
Subv 2017-01-05 12:29:18 -05:00
parent 20541736eb
commit e7e3afb33f
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/tests/gpu/displaytransfer.cpp
View File

@ -45,8 +45,8 @@ union Dimensions {
}; };
static void DisplayTransferAndWait(u32* input, u32* output, Dimensions input_dimensions, Dimensions output_dimensions, u32 flags) { static void DisplayTransferAndWait(u32* input, u32* output, Dimensions input_dimensions, Dimensions output_dimensions, u32 flags) {
GSPGPU_FlushDataCache(input, sizeof(u32)); GSPGPU_FlushDataCache(input, 0x4000 * sizeof(u32));
GSPGPU_InvalidateDataCache(output, sizeof(u32)); GSPGPU_InvalidateDataCache(output, 0x4000 * sizeof(u32));
Result res = GX_DisplayTransfer(input, input_dimensions.raw, output, output_dimensions.raw, flags); Result res = GX_DisplayTransfer(input, input_dimensions.raw, output, output_dimensions.raw, flags);
if ((u32)res != 0) { if ((u32)res != 0) {
Log(Common::FormatString("Something went wrong: %u\n", (u32)res)); Log(Common::FormatString("Something went wrong: %u\n", (u32)res));

6
source/tests/gpu/memoryfills.cpp
View File

@ -30,9 +30,6 @@ static bool Fill32Bits(u8* buffer) {
TestEquals(buffer[5], 0xFFu); TestEquals(buffer[5], 0xFFu);
TestEquals(buffer[6], 0xFFu); TestEquals(buffer[6], 0xFFu);
TestEquals(buffer[7], 0x00u); TestEquals(buffer[7], 0x00u);
TestEquals(buffer[48], 0x00u);
TestEquals(buffer[49], 0x00u);
TestEquals(buffer[49], 0x00u);
FillAndWait(buffer, 0x0000FFFF, 48, 0x201, false); FillAndWait(buffer, 0x0000FFFF, 48, 0x201, false);
TestEquals(buffer[0], 0xFFu); TestEquals(buffer[0], 0xFFu);
@ -57,9 +54,6 @@ static bool Fill24Bits(u8* buffer) {
TestEquals(buffer[5], 0xFFu); TestEquals(buffer[5], 0xFFu);
TestEquals(buffer[6], 0xFFu); TestEquals(buffer[6], 0xFFu);
TestEquals(buffer[7], 0xFFu); TestEquals(buffer[7], 0xFFu);
TestEquals(buffer[48], 0x00u);
TestEquals(buffer[49], 0x00u);
TestEquals(buffer[49], 0x00u);
FillAndWait(buffer, 0xFFFFFFFF, 48, 0x101); FillAndWait(buffer, 0xFFFFFFFF, 48, 0x101);
TestEquals(buffer[0], 0xFFu); TestEquals(buffer[0], 0xFFu);