From 708bf9f040c54902c75ecb18ea56d2da4f635191 Mon Sep 17 00:00:00 2001 From: wheremyfoodat Date: Fri, 13 Jan 2023 22:59:25 +0200 Subject: [PATCH] Fix merge failure --- src/core/PICA/gpu.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/core/PICA/gpu.cpp b/src/core/PICA/gpu.cpp index c9e22190..632ee75a 100644 --- a/src/core/PICA/gpu.cpp +++ b/src/core/PICA/gpu.cpp @@ -48,7 +48,6 @@ void GPU::drawArrays() { const u32 primConfig = regs[PICAInternalRegs::PrimitiveConfig]; const u32 primType = (primConfig >> 8) & 3; 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 ((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? u8* fcram = mem.getFCRAM(); std::memcpy(&vram[dest - vramStart], &fcram[source - fcramStart], size); -} \ No newline at end of file +}