Merge pull request #4049 from unknownbrackets/gpu-minor

Skip bounding box when set to 0
This commit is contained in:
Henrik Rydgård 2013-10-05 23:03:08 -07:00
commit 92a2f2d0f0
2 changed files with 8 additions and 1 deletions

View File

@ -824,6 +824,12 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) {
break;
case GE_CMD_BOUNDINGBOX:
// Just resetting, nothing to bound.
if (data == 0) {
// TODO: Should this set the bboxResult? Let's set it true for now.
currentList->bboxResult = true;
break;
}
if ((data % 8 == 0) && data < 64) { // Sanity check
void *control_points = Memory::GetPointer(gstate_c.vertexAddr);
if (gstate.vertType & GE_VTYPE_IDX_MASK) {

View File

@ -472,7 +472,8 @@ void SoftGPU::ExecuteOp(u32 op, u32 diff)
if (Memory::IsValidAddress(clutAddr)) {
Memory::MemcpyUnchecked(clut, clutAddr, clutTotalBytes);
} else {
// TODO: Do something to the CLUT with 0?
} else if (clutAddr != 0) {
// TODO: Does this make any sense?
ERROR_LOG_REPORT_ONCE(badClut, G3D, "Software: Invalid CLUT address, filling with garbage instead of crashing");
memset(clut, 0xFF, clutTotalBytes);