diff --git a/GPU/D3D11/FramebufferManagerD3D11.cpp b/GPU/D3D11/FramebufferManagerD3D11.cpp index 270cf4f392..b8b317bfbe 100644 --- a/GPU/D3D11/FramebufferManagerD3D11.cpp +++ b/GPU/D3D11/FramebufferManagerD3D11.cpp @@ -859,7 +859,7 @@ void FramebufferManagerD3D11::PackDepthbuffer(VirtualFramebuffer *vfb, int x, in void FramebufferManagerD3D11::EndFrame() { if (resized_) { - DestroyAllFBOs(false); + DestroyAllFBOs(); // Check if postprocessing shader is doing upscaling as it requires native resolution const ShaderInfo *shaderInfo = 0; @@ -904,7 +904,7 @@ void FramebufferManagerD3D11::EndFrame() { } void FramebufferManagerD3D11::DeviceLost() { - DestroyAllFBOs(false); + DestroyAllFBOs(); resized_ = false; } @@ -927,7 +927,7 @@ std::vector FramebufferManagerD3D11::GetFramebufferList() { return list; } -void FramebufferManagerD3D11::DestroyAllFBOs(bool forceDelete) { +void FramebufferManagerD3D11::DestroyAllFBOs() { draw_->BindBackbufferAsRenderTarget(); currentRenderVfb_ = 0; displayFramebuf_ = 0; diff --git a/GPU/D3D11/FramebufferManagerD3D11.h b/GPU/D3D11/FramebufferManagerD3D11.h index 8a81addc61..f6070d76ff 100644 --- a/GPU/D3D11/FramebufferManagerD3D11.h +++ b/GPU/D3D11/FramebufferManagerD3D11.h @@ -51,7 +51,7 @@ public: void DrawActiveTexture(float x, float y, float w, float h, float destW, float destH, float u0, float v0, float u1, float v1, int uvRotation, bool linearFilter) override; - void DestroyAllFBOs(bool forceDelete); + void DestroyAllFBOs(); void EndFrame(); void Resized() override; diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp index 400491bbf4..93c3dcc126 100644 --- a/GPU/D3D11/GPU_D3D11.cpp +++ b/GPU/D3D11/GPU_D3D11.cpp @@ -190,7 +190,7 @@ GPU_D3D11::GPU_D3D11(GraphicsContext *gfxCtx, Draw::DrawContext *draw) GPU_D3D11::~GPU_D3D11() { delete depalShaderCache_; - framebufferManagerD3D11_->DestroyAllFBOs(true); + framebufferManagerD3D11_->DestroyAllFBOs(); delete framebufferManagerD3D11_; shaderManagerD3D11_->ClearShaders(); delete shaderManagerD3D11_; @@ -750,7 +750,7 @@ void GPU_D3D11::DoState(PointerWrap &p) { drawEngine_.ClearTrackedVertexArrays(); gstate_c.Dirty(DIRTY_TEXTURE_IMAGE); - framebufferManagerD3D11_->DestroyAllFBOs(true); + framebufferManagerD3D11_->DestroyAllFBOs(); shaderManagerD3D11_->ClearShaders(); } } diff --git a/GPU/Directx9/FramebufferDX9.cpp b/GPU/Directx9/FramebufferDX9.cpp index e333a64052..e841242155 100644 --- a/GPU/Directx9/FramebufferDX9.cpp +++ b/GPU/Directx9/FramebufferDX9.cpp @@ -752,7 +752,7 @@ static const D3DVERTEXELEMENT9 g_FramebufferVertexElements[] = { void FramebufferManagerDX9::EndFrame() { if (resized_) { - DestroyAllFBOs(false); + DestroyAllFBOs(); // Actually, auto mode should be more granular... // Round up to a zoom factor for the render size. int zoom = g_Config.iInternalResolution; @@ -785,7 +785,7 @@ static const D3DVERTEXELEMENT9 g_FramebufferVertexElements[] = { } void FramebufferManagerDX9::DeviceLost() { - DestroyAllFBOs(false); + DestroyAllFBOs(); resized_ = false; } @@ -821,7 +821,7 @@ static const D3DVERTEXELEMENT9 g_FramebufferVertexElements[] = { } } - void FramebufferManagerDX9::DestroyAllFBOs(bool forceDelete) { + void FramebufferManagerDX9::DestroyAllFBOs() { draw_->BindBackbufferAsRenderTarget(); currentRenderVfb_ = 0; displayFramebuf_ = 0; diff --git a/GPU/Directx9/FramebufferDX9.h b/GPU/Directx9/FramebufferDX9.h index fdd9e1a348..559f9ca595 100644 --- a/GPU/Directx9/FramebufferDX9.h +++ b/GPU/Directx9/FramebufferDX9.h @@ -53,7 +53,7 @@ public: void DrawActiveTexture(float x, float y, float w, float h, float destW, float destH, float u0, float v0, float u1, float v1, int uvRotation, bool linearFilter) override; - void DestroyAllFBOs(bool forceDelete); + void DestroyAllFBOs(); void EndFrame(); void Resized() override; diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp index 26d0e7da28..dc1f079812 100644 --- a/GPU/Directx9/GPU_DX9.cpp +++ b/GPU/Directx9/GPU_DX9.cpp @@ -223,7 +223,7 @@ void GPU_DX9::CheckGPUFeatures() { } GPU_DX9::~GPU_DX9() { - framebufferManagerDX9_->DestroyAllFBOs(true); + framebufferManagerDX9_->DestroyAllFBOs(); delete framebufferManagerDX9_; delete textureCache_; shaderManagerDX9_->ClearCache(true); @@ -690,7 +690,7 @@ void GPU_DX9::DoState(PointerWrap &p) { drawEngine_.ClearTrackedVertexArrays(); gstate_c.Dirty(DIRTY_TEXTURE_IMAGE); - framebufferManagerDX9_->DestroyAllFBOs(true); + framebufferManagerDX9_->DestroyAllFBOs(); shaderManagerDX9_->ClearCache(true); } } diff --git a/GPU/GLES/FramebufferManagerGLES.cpp b/GPU/GLES/FramebufferManagerGLES.cpp index fa32795bfc..d7db65d4da 100644 --- a/GPU/GLES/FramebufferManagerGLES.cpp +++ b/GPU/GLES/FramebufferManagerGLES.cpp @@ -1151,7 +1151,7 @@ void FramebufferManagerGLES::EndFrame() { CHECK_GL_ERROR_IF_DEBUG(); if (resized_) { // TODO: Only do this if the new size actually changed the renderwidth/height. - DestroyAllFBOs(false); + DestroyAllFBOs(); // Check if postprocessing shader is doing upscaling as it requires native resolution const ShaderInfo *shaderInfo = 0; @@ -1223,7 +1223,7 @@ void FramebufferManagerGLES::EndFrame() { } void FramebufferManagerGLES::DeviceLost() { - DestroyAllFBOs(false); + DestroyAllFBOs(); DestroyDraw2DProgram(); resized_ = false; } @@ -1247,7 +1247,7 @@ std::vector FramebufferManagerGLES::GetFramebufferList() { return list; } -void FramebufferManagerGLES::DestroyAllFBOs(bool forceDelete) { +void FramebufferManagerGLES::DestroyAllFBOs() { CHECK_GL_ERROR_IF_DEBUG(); draw_->BindBackbufferAsRenderTarget(); currentRenderVfb_ = 0; diff --git a/GPU/GLES/FramebufferManagerGLES.h b/GPU/GLES/FramebufferManagerGLES.h index 6f910f8c25..649b4741a2 100644 --- a/GPU/GLES/FramebufferManagerGLES.h +++ b/GPU/GLES/FramebufferManagerGLES.h @@ -64,7 +64,7 @@ public: // x,y,w,h are relative to destW, destH which fill out the target completely. void DrawActiveTexture(float x, float y, float w, float h, float destW, float destH, float u0, float v0, float u1, float v1, int uvRotation, bool linearFilter) override; - void DestroyAllFBOs(bool forceDelete); + void DestroyAllFBOs(); virtual void Init() override; void EndFrame(); diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp index 997319bc44..3fb1bae743 100644 --- a/GPU/GLES/GPU_GLES.cpp +++ b/GPU/GLES/GPU_GLES.cpp @@ -188,7 +188,7 @@ GPU_GLES::GPU_GLES(GraphicsContext *gfxCtx, Draw::DrawContext *draw) } GPU_GLES::~GPU_GLES() { - framebufferManagerGL_->DestroyAllFBOs(true); + framebufferManagerGL_->DestroyAllFBOs(); shaderManagerGL_->ClearCache(true); depalShaderCache_.Clear(); fragmentTestCache_.Clear(); @@ -405,7 +405,7 @@ void GPU_GLES::DeviceRestore() { void GPU_GLES::ReinitializeInternal() { textureCacheGL_->Clear(true); depalShaderCache_.Clear(); - framebufferManagerGL_->DestroyAllFBOs(true); + framebufferManagerGL_->DestroyAllFBOs(); framebufferManagerGL_->Resized(); } @@ -932,7 +932,7 @@ void GPU_GLES::DoState(PointerWrap &p) { drawEngine_.ClearTrackedVertexArrays(); gstate_c.Dirty(DIRTY_TEXTURE_IMAGE); - framebufferManagerGL_->DestroyAllFBOs(true); + framebufferManagerGL_->DestroyAllFBOs(); shaderManagerGL_->ClearCache(true); } } diff --git a/GPU/Vulkan/FramebufferVulkan.cpp b/GPU/Vulkan/FramebufferVulkan.cpp index 948abc3ef6..e3be6cec11 100644 --- a/GPU/Vulkan/FramebufferVulkan.cpp +++ b/GPU/Vulkan/FramebufferVulkan.cpp @@ -1040,7 +1040,7 @@ void FramebufferManagerVulkan::BeginFrameVulkan() { void FramebufferManagerVulkan::EndFrame() { if (resized_) { // TODO: Only do this if the new size actually changed the renderwidth/height. - DestroyAllFBOs(false); + DestroyAllFBOs(); // Check if postprocessing shader is doing upscaling as it requires native resolution const ShaderInfo *shaderInfo = 0; @@ -1101,7 +1101,7 @@ void FramebufferManagerVulkan::EndFrame() { void FramebufferManagerVulkan::DeviceLost() { vulkan2D_.DeviceLost(); - DestroyAllFBOs(false); + DestroyAllFBOs(); DestroyDeviceObjects(); resized_ = false; } @@ -1132,7 +1132,7 @@ std::vector FramebufferManagerVulkan::GetFramebufferList() { return list; } -void FramebufferManagerVulkan::DestroyAllFBOs(bool forceDelete) { +void FramebufferManagerVulkan::DestroyAllFBOs() { currentRenderVfb_ = 0; displayFramebuf_ = 0; prevDisplayFramebuf_ = 0; diff --git a/GPU/Vulkan/FramebufferVulkan.h b/GPU/Vulkan/FramebufferVulkan.h index 74f6dce35f..3f44706d14 100644 --- a/GPU/Vulkan/FramebufferVulkan.h +++ b/GPU/Vulkan/FramebufferVulkan.h @@ -74,7 +74,7 @@ public: void DrawTexture(VulkanTexture *texture, float x, float y, float w, float h, float destW, float destH, float u0, float v0, float u1, float v1, VkPipeline pipeline, int uvRotation); void DrawActiveTexture(float x, float y, float w, float h, float destW, float destH, float u0, float v0, float u1, float v1, int uvRotation, bool linearFilter) override; - void DestroyAllFBOs(bool forceDelete); + void DestroyAllFBOs(); virtual void Init() override; diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp index 582490b97f..f8cf380add 100644 --- a/GPU/Vulkan/GPU_Vulkan.cpp +++ b/GPU/Vulkan/GPU_Vulkan.cpp @@ -157,7 +157,7 @@ GPU_Vulkan::GPU_Vulkan(GraphicsContext *gfxCtx, Draw::DrawContext *draw) } GPU_Vulkan::~GPU_Vulkan() { - framebufferManagerVulkan_->DestroyAllFBOs(true); + framebufferManagerVulkan_->DestroyAllFBOs(); depalShaderCache_.Clear(); delete pipelineManager_; delete shaderManagerVulkan_; @@ -315,7 +315,7 @@ void GPU_Vulkan::BuildReportingInfo() { void GPU_Vulkan::ReinitializeInternal() { textureCacheVulkan_->Clear(true); depalShaderCache_.Clear(); - framebufferManagerVulkan_->DestroyAllFBOs(true); + framebufferManagerVulkan_->DestroyAllFBOs(); framebufferManagerVulkan_->Resized(); } @@ -823,7 +823,7 @@ void GPU_Vulkan::DoState(PointerWrap &p) { depalShaderCache_.Clear(); gstate_c.Dirty(DIRTY_TEXTURE_IMAGE); - framebufferManagerVulkan_->DestroyAllFBOs(true); + framebufferManagerVulkan_->DestroyAllFBOs(); shaderManagerVulkan_->ClearShaders(); pipelineManager_->Clear(); }