From 23367925f1f5d8397e80f98c0642262958c540d1 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Sat, 18 Mar 2017 21:22:27 +0100 Subject: [PATCH] Change a PanicAlert to an ERROR_LOG. Should possibly report.. http://forums.ppsspp.org/showthread.php?tid=1310&page=3 Add a comment. --- Core/HW/SasAudio.cpp | 3 ++- GPU/D3D11/GPU_D3D11.cpp | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Core/HW/SasAudio.cpp b/Core/HW/SasAudio.cpp index 91b96d7443..aefd44690e 100644 --- a/Core/HW/SasAudio.cpp +++ b/Core/HW/SasAudio.cpp @@ -505,7 +505,8 @@ void SasInstance::MixVoice(SasVoice &voice) { u32 sampleFrac = voice.sampleFrac; int samplesToRead = (sampleFrac + voicePitch * std::max(0, grainSize - delay)) >> PSP_SAS_PITCH_BASE_SHIFT; if (samplesToRead > ARRAY_SIZE(mixTemp_) - 2) { - PanicAlert("Too many samples to read! This shouldn't happen."); + ERROR_LOG(SCESAS, "Too many samples to read (%d)! This shouldn't happen.", samplesToRead); + samplesToRead = ARRAY_SIZE(mixTemp_) - 2; } voice.ReadSamples(&mixTemp_[2], samplesToRead); int tempPos = 2 + samplesToRead; diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp index 7cb27d8349..b7dfe31e02 100644 --- a/GPU/D3D11/GPU_D3D11.cpp +++ b/GPU/D3D11/GPU_D3D11.cpp @@ -343,6 +343,8 @@ void GPU_D3D11::BeginFrameInternal() { } void GPU_D3D11::SetDisplayFramebuffer(u32 framebuf, u32 stride, GEBufferFormat format) { + // TODO: Some games like Spongebob - Yellow Avenger, never change framebuffer, they blit to it. + // So breaking on frames doesn't work. Might want to move this to sceDisplay vsync. host->GPUNotifyDisplay(framebuf, stride, format); framebufferManagerD3D11_->SetDisplayFramebuffer(framebuf, stride, format); }