diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp index 89f0cf39b2..117e5a8c07 100644 --- a/Core/HLE/sceKernel.cpp +++ b/Core/HLE/sceKernel.cpp @@ -524,20 +524,26 @@ struct SystemStatus { SceUInt perfcounter3; }; -u32 sceKernelReferSystemStatus(u32 statusPtr) -{ +int sceKernelReferSystemStatus(u32 statusPtr) { DEBUG_LOG(HLE, "sceKernelReferSystemStatus(%08x)", statusPtr); if (Memory::IsValidAddress(statusPtr)) { SystemStatus status; memset(&status, 0, sizeof(SystemStatus)); status.size = sizeof(SystemStatus); + // TODO: Fill in the struct! Memory::WriteStruct(statusPtr, &status); } return 0; } -u32 sceKernelReferGlobalProfiler(u32 statusPtr) { - DEBUG_LOG(HLE, "sceKernelReferGlobalProfiler(%08x)", statusPtr); +int sceKernelReferThreadProfiler(u32 statusPtr) { + ERROR_LOG(HLE, "UNIMPL sceKernelReferThreadProfiler(%08x)", statusPtr); + // Ignore for now + return 0; +} + +int sceKernelReferGlobalProfiler(u32 statusPtr) { + DEBUG_LOG(HLE, "UNIMPL sceKernelReferGlobalProfiler(%08x)", statusPtr); // Ignore for now return 0; } @@ -615,9 +621,9 @@ const HLEFunction ThreadManForUser[] = {0xdb738f35,WrapI_U,"sceKernelGetSystemTime"}, {0x369ed59d,WrapU_V,"sceKernelGetSystemTimeLow"}, - {0x8218B4DD,&WrapU_U,"sceKernelReferGlobalProfiler"}, - {0x627E6F3A,&WrapU_U,"sceKernelReferSystemStatus"}, - {0x64D4540E,0,"sceKernelReferThreadProfiler"}, + {0x8218B4DD,WrapI_U,"sceKernelReferGlobalProfiler"}, + {0x627E6F3A,WrapI_U,"sceKernelReferSystemStatus"}, + {0x64D4540E,WrapI_U,"sceKernelReferThreadProfiler"}, //Fifa Street 2 uses alarms {0x6652b8ca,WrapI_UUU,"sceKernelSetAlarm"}, diff --git a/Core/Util/PPGeDraw.cpp b/Core/Util/PPGeDraw.cpp index fe84cd7134..c920d73018 100644 --- a/Core/Util/PPGeDraw.cpp +++ b/Core/Util/PPGeDraw.cpp @@ -199,15 +199,19 @@ void PPGeBegin() dataWritePtr = dataPtr; // Set up the correct states for UI drawing + WriteCmd(GE_CMD_OFFSETADDR, 0); WriteCmd(GE_CMD_ALPHABLENDENABLE, 1); WriteCmd(GE_CMD_BLENDMODE, 2 | (3 << 4)); WriteCmd(GE_CMD_ALPHATESTENABLE, 0); WriteCmd(GE_CMD_COLORTESTENABLE, 0); WriteCmd(GE_CMD_ZTESTENABLE, 0); + WriteCmd(GE_CMD_LIGHTINGENABLE, 0); WriteCmd(GE_CMD_FOGENABLE, 0); WriteCmd(GE_CMD_STENCILTESTENABLE, 0); WriteCmd(GE_CMD_CULLFACEENABLE, 0); WriteCmd(GE_CMD_CLEARMODE, 0); // Normal mode + WriteCmd(GE_CMD_MASKRGB, 0); + WriteCmd(GE_CMD_MASKALPHA, 0); PPGeSetDefaultTexture(); diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp index cbbaca510d..7a6e6545f9 100644 --- a/GPU/GLES/DisplayListInterpreter.cpp +++ b/GPU/GLES/DisplayListInterpreter.cpp @@ -296,7 +296,7 @@ void GLES_GPU::PreExecuteOp(u32 op, u32 diff) { if (flushBeforeCommand_[cmd] == 1 || (diff && flushBeforeCommand_[cmd] == 2)) { if (dumpThisFrame_) { - NOTICE_LOG(G3D, "================ FLUSH ================"); + NOTICE_LOG(HLE, "================ FLUSH ================"); } transformDraw_.Flush(); } diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index 8d710972ff..5c5f98b38b 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -107,7 +107,7 @@ bool GPUCommon::InterpretList(DisplayList &list) if (dumpThisFrame_) { char temp[256]; GeDisassembleOp(list.pc, op, prev, temp); - NOTICE_LOG(G3D, "%s", temp); + NOTICE_LOG(HLE, "%s", temp); } gstate.cmdmem[cmd] = op; // crashes if I try to put the whole op there??