moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge failure

Browse Source
This commit is contained in:
wheremyfoodat
2023-01-13 22:59:25 +02:00
parent eae9bc67dd
commit 708bf9f040
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/PICA/gpu.cpp
View File

@@ -48,7 +48,6 @@ void GPU::drawArrays() {
const u32 primConfig = regs[PICAInternalRegs::PrimitiveConfig]; const u32 primConfig = regs[PICAInternalRegs::PrimitiveConfig];
const u32 primType = (primConfig >> 8) & 3; const u32 primType = (primConfig >> 8) & 3;
if (primType != 0 && primType != 1) Helpers::panic("[PICA] Tried to draw unimplemented shape %d\n", primType); if (primType != 0 && primType != 1) Helpers::panic("[PICA] Tried to draw unimplemented shape %d\n", primType);
if (vertexCount > vertexBufferSize) Helpers::panic("[PICA] vertexCount > vertexBufferSize");
if (vertexCount > Renderer::vertexBufferSize) Helpers::panic("[PICA] vertexCount > vertexBufferSize"); if (vertexCount > Renderer::vertexBufferSize) Helpers::panic("[PICA] vertexCount > vertexBufferSize");
if ((primType == 0 && vertexCount % 3) || (primType == 1 && vertexCount < 3)) { if ((primType == 0 && vertexCount % 3) || (primType == 1 && vertexCount < 3)) {
@@ -180,4 +179,4 @@ void GPU::fireDMA(u32 dest, u32 source, u32 size) {
// Valid, optimized FCRAM->VRAM DMA. TODO: Is VRAM->VRAM DMA allowed? // Valid, optimized FCRAM->VRAM DMA. TODO: Is VRAM->VRAM DMA allowed?
u8* fcram = mem.getFCRAM(); u8* fcram = mem.getFCRAM();
std::memcpy(&vram[dest - vramStart], &fcram[source - fcramStart], size); std::memcpy(&vram[dest - vramStart], &fcram[source - fcramStart], size);
} }