From 92df6b832c241706fcecae942d963cd755736986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sat, 3 Dec 2022 11:14:08 +0100
Subject: [PATCH] Safer and simpler alternative to cbfa4bf.

See #16483
---
 GPU/D3D11/GPU_D3D11.cpp   | 4 ----
 GPU/D3D11/GPU_D3D11.h     | 1 -
 GPU/Directx9/GPU_DX9.cpp  | 4 ----
 GPU/Directx9/GPU_DX9.h    | 1 -
 GPU/GLES/GPU_GLES.cpp     | 4 ----
 GPU/GLES/GPU_GLES.h       | 1 -
 GPU/GPUCommon.cpp         | 4 ++++
 GPU/GPUCommon.h           | 2 ++
 GPU/Vulkan/GPU_Vulkan.cpp | 4 ----
 GPU/Vulkan/GPU_Vulkan.h   | 1 -
 10 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/GPU/D3D11/GPU_D3D11.cpp b/GPU/D3D11/GPU_D3D11.cpp
index 6e3eb0d740..8259d9fb5c 100644
--- a/GPU/D3D11/GPU_D3D11.cpp
+++ b/GPU/D3D11/GPU_D3D11.cpp
@@ -223,10 +223,6 @@ void GPU_D3D11::GetStats(char *buffer, size_t bufsize) {
 	);
 }
 
-void GPU_D3D11::ClearCacheNextFrame() {
-	textureCacheD3D11_->ClearNextFrame();
-}
-
 void GPU_D3D11::ClearShaderCache() {
 	shaderManagerD3D11_->ClearShaders();
 	drawEngine_.ClearInputLayoutMap();
diff --git a/GPU/D3D11/GPU_D3D11.h b/GPU/D3D11/GPU_D3D11.h
index 0cba325618..e56acc632a 100644
--- a/GPU/D3D11/GPU_D3D11.h
+++ b/GPU/D3D11/GPU_D3D11.h
@@ -41,7 +41,6 @@ public:
 	void ExecuteOp(u32 op, u32 diff) override;
 
 	void GetStats(char *buffer, size_t bufsize) override;
-	void ClearCacheNextFrame() override;
 	void DeviceLost() override;  // Only happens on Android. Drop all textures and shaders.
 	void DeviceRestore() override;
 
diff --git a/GPU/Directx9/GPU_DX9.cpp b/GPU/Directx9/GPU_DX9.cpp
index e13a3b4f3d..c4053953cc 100644
--- a/GPU/Directx9/GPU_DX9.cpp
+++ b/GPU/Directx9/GPU_DX9.cpp
@@ -220,10 +220,6 @@ void GPU_DX9::GetStats(char *buffer, size_t bufsize) {
 	);
 }
 
-void GPU_DX9::ClearCacheNextFrame() {
-	textureCacheDX9_->ClearNextFrame();
-}
-
 void GPU_DX9::ClearShaderCache() {
 	shaderManagerDX9_->ClearCache(true);
 }
diff --git a/GPU/Directx9/GPU_DX9.h b/GPU/Directx9/GPU_DX9.h
index 0ec463e55e..ff23b3fb23 100644
--- a/GPU/Directx9/GPU_DX9.h
+++ b/GPU/Directx9/GPU_DX9.h
@@ -41,7 +41,6 @@ public:
 
 	void ReapplyGfxState() override;
 	void GetStats(char *buffer, size_t bufsize) override;
-	void ClearCacheNextFrame() override;
 	void DeviceLost() override;  // Only happens on Android. Drop all textures and shaders.
 	void DeviceRestore() override;
 
diff --git a/GPU/GLES/GPU_GLES.cpp b/GPU/GLES/GPU_GLES.cpp
index 00f5eb43cf..c110380c91 100644
--- a/GPU/GLES/GPU_GLES.cpp
+++ b/GPU/GLES/GPU_GLES.cpp
@@ -362,10 +362,6 @@ void GPU_GLES::GetStats(char *buffer, size_t bufsize) {
 	);
 }
 
-void GPU_GLES::ClearCacheNextFrame() {
-	textureCacheGL_->ClearNextFrame();
-}
-
 void GPU_GLES::ClearShaderCache() {
 	shaderManagerGL_->ClearCache(true);
 }
diff --git a/GPU/GLES/GPU_GLES.h b/GPU/GLES/GPU_GLES.h
index 4955a3c511..d9ac76390f 100644
--- a/GPU/GLES/GPU_GLES.h
+++ b/GPU/GLES/GPU_GLES.h
@@ -49,7 +49,6 @@ public:
 	void ReapplyGfxState() override;
 	void GetStats(char *buffer, size_t bufsize) override;
 
-	void ClearCacheNextFrame() override;
 	void DeviceLost() override;  // Only happens on Android. Drop all textures and shaders.
 	void DeviceRestore() override;
 
diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp
index 62112f899e..20d97649df 100644
--- a/GPU/GPUCommon.cpp
+++ b/GPU/GPUCommon.cpp
@@ -627,6 +627,10 @@ void GPUCommon::NotifyDisplayResized() {
 	displayResized_ = true;
 }
 
+void GPUCommon::ClearCacheNextFrame() {
+	textureCache_->ClearNextFrame();
+}
+
 // Called once per frame. Might also get called during the pause screen
 // if "transparent".
 void GPUCommon::CheckConfigChanged() {
diff --git a/GPU/GPUCommon.h b/GPU/GPUCommon.h
index 7d2cde8b12..96481a9c01 100644
--- a/GPU/GPUCommon.h
+++ b/GPU/GPUCommon.h
@@ -267,6 +267,8 @@ protected:
 	void DeviceLost() override;
 	void DeviceRestore() override;
 
+	void ClearCacheNextFrame();
+
 	virtual void CheckRenderResized();
 
 	// Add additional common features dependent on other features, which may be backend-determined.
diff --git a/GPU/Vulkan/GPU_Vulkan.cpp b/GPU/Vulkan/GPU_Vulkan.cpp
index f91ed4df80..1606073ee9 100644
--- a/GPU/Vulkan/GPU_Vulkan.cpp
+++ b/GPU/Vulkan/GPU_Vulkan.cpp
@@ -528,10 +528,6 @@ void GPU_Vulkan::GetStats(char *buffer, size_t bufsize) {
 	);
 }
 
-void GPU_Vulkan::ClearCacheNextFrame() {
-	textureCacheVulkan_->ClearNextFrame();
-}
-
 void GPU_Vulkan::ClearShaderCache() {
 	// TODO
 }
diff --git a/GPU/Vulkan/GPU_Vulkan.h b/GPU/Vulkan/GPU_Vulkan.h
index 7b83f4d583..f4b56c27e4 100644
--- a/GPU/Vulkan/GPU_Vulkan.h
+++ b/GPU/Vulkan/GPU_Vulkan.h
@@ -51,7 +51,6 @@ public:
 	void ExecuteOp(u32 op, u32 diff) override;
 
 	void GetStats(char *buffer, size_t bufsize) override;
-	void ClearCacheNextFrame() override;
 	void DeviceLost() override;  // Only happens on Android. Drop all textures and shaders.
 	void DeviceRestore() override;