Safer and simpler alternative to cbfa4bf.

See #16483
hrydgard · Dec 3, 2022 · 92df6b8 · 92df6b8
1 parent 02b8bf3
commit 92df6b8
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 20 deletions.
diff --git 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
@@ -41,7 +41,6 @@ class GPU_D3D11 : public GPUCommon {
 	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
@@ -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
@@ -41,7 +41,6 @@ class GPU_DX9 : public GPUCommon {
 
 	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
@@ -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
@@ -49,7 +49,6 @@ class GPU_GLES : public GPUCommon {
 	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
@@ -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
@@ -267,6 +267,8 @@ class GPUCommon : public GPUInterface, public GPUDebugInterface {
 	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
@@ -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
@@ -51,7 +51,6 @@ class GPU_Vulkan : public GPUCommon {
 	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;