From f625f18eba49458a758c7f192d7873cd5d26a49f Mon Sep 17 00:00:00 2001 From: Herman Semenov Date: Thu, 11 Apr 2024 14:52:55 +0300 Subject: [PATCH] [GPU/HLES] 'fs' its already NULL, removed excess delete and bufferState_ always ATRAC_STATUS_HALFWAY_BUFFER --- Core/HLE/sceAtrac.cpp | 3 +-- GPU/GLES/ShaderManagerGLES.cpp | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index f83d9ffdf1..7fcfc949d5 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -1795,8 +1795,7 @@ static u32 sceAtracResetPlayPosition(int atracID, int sample, int bytesWrittenFi // Did we transition to a full buffer? if (atrac->first_.size >= atrac->first_.filesize) { atrac->first_.size = atrac->first_.filesize; - if (atrac->bufferState_ == ATRAC_STATUS_HALFWAY_BUFFER) - atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; + atrac->bufferState_ = ATRAC_STATUS_ALL_DATA_LOADED; } } else { if (bufferInfo.first.filePos > atrac->first_.filesize) { diff --git a/GPU/GLES/ShaderManagerGLES.cpp b/GPU/GLES/ShaderManagerGLES.cpp index dc36d8e114..431da419f4 100644 --- a/GPU/GLES/ShaderManagerGLES.cpp +++ b/GPU/GLES/ShaderManagerGLES.cpp @@ -1109,7 +1109,6 @@ bool ShaderManagerGLES::LoadCache(File::IOFile &f) { // Give up on using the cache, just bail. We can't safely create the fallback shaders here // without trying to deduce the vertType from the VSID. ERROR_LOG(G3D, "Failed to compile a vertex shader loading from cache. Skipping rest of shader cache."); - delete vs; pending.Clear(); return false; } @@ -1127,7 +1126,6 @@ bool ShaderManagerGLES::LoadCache(File::IOFile &f) { // Give up on using the cache - something went wrong. // We'll still keep the shaders we generated so far around. ERROR_LOG(G3D, "Failed to compile a fragment shader loading from cache. Skipping rest of shader cache."); - delete fs; pending.Clear(); return false; }