mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-14 18:19:36 +01:00
Warning fix
This commit is contained in:
1 parent
be8c543563
commit
dd175b10fd
4 files changed
+11
-5
No files matched your search
@@ -432,7 +432,6 @@ bool DumpExecute::SubmitCmds(const void *p, u32 sz) {
|
||||
}
|
||||
|
||||
execListQueue.clear();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
+6
-2
@@ -561,6 +561,8 @@ void GPUCommon::RunGe(DeferredAction action, bool forceRunDirect) {
|
||||
RunDeferredAction();
|
||||
#else
|
||||
// No sense in switching core mode if there's nothing to do, just maybe some bookkeeping.
|
||||
// Also, in some situations like dump playback, we run DLs directly too (yes, this means that
|
||||
// we can't step through display lists in a dump, which should be fixed later).
|
||||
if (dlQueue.empty() || forceRunDirect) {
|
||||
ProcessDLQueue(false);
|
||||
RunDeferredAction();
|
||||
@@ -580,7 +582,9 @@ void GPUCommon::RunDeferredAction() {
|
||||
CoreTiming::ForceCheck();
|
||||
}
|
||||
if (deferredAction_.reschedule) {
|
||||
hleReSchedule("ge deferred action");
|
||||
// NOTE: hleReSchedule doesn't work if we're not in a syscall. We just reschedule, implementing the parts of hleFinishSyscall that are relevant.
|
||||
__KernelForceCallbacks();
|
||||
__KernelReSchedule(true, "ge deferred action");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -879,7 +883,7 @@ DLResult GPUCommon::ProcessDLQueue(bool fromCore) {
|
||||
|
||||
for (int listIndex = GetNextListIndex(); listIndex != -1; listIndex = GetNextListIndex()) {
|
||||
DisplayList &l = dls[listIndex];
|
||||
DEBUG_LOG(Log::G3D, "Starting DL execution at %08x - stall = %08x (startingTicks=%d)", l.pc, l.stall, startingTicks);
|
||||
DEBUG_LOG(Log::G3D, "Starting DL execution at %08x - stall = %08x (startingTicks=%lld)", l.pc, l.stall, startingTicks);
|
||||
if (!InterpretList(l)) {
|
||||
return DLResult::Error;
|
||||
}
|
||||
|
||||
@@ -1168,8 +1168,9 @@ void SoftGPU::Execute_TgenMtxData(u32 op, u32 diff) {
|
||||
}
|
||||
|
||||
// Doesn't wrap to any other matrix.
|
||||
if ((num & 0xF) < 12) {
|
||||
matrixVisible.tgen[num & 0xF] = op & 0x00FFFFFF;
|
||||
int wrappedNum = num & 0xF;
|
||||
if (wrappedNum < 12) {
|
||||
matrixVisible.tgen[wrappedNum] = op & 0x00FFFFFF;
|
||||
}
|
||||
|
||||
num++;
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Common/Log.h"
|
||||
#include "Common/CommonTypes.h"
|
||||
#include "Common/File/Path.h"
|
||||
|
||||
@@ -31,6 +32,7 @@ public:
|
||||
virtual void SendDebugOutput(const std::string &output) {
|
||||
if (!writeDebugOutput_)
|
||||
return;
|
||||
OutputDebugStringUTF8(output.c_str());
|
||||
if (output.find('\n') != output.npos) {
|
||||
FlushDebugOutput();
|
||||
fwrite(output.data(), sizeof(char), output.length(), stdout);
|
||||
|
||||
Reference in new issue
Block a user