From ae474f5f1803ba475ba8c835c5249dbd5992ca71 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Mon, 15 Feb 2021 11:25:46 -0800
Subject: [PATCH] GPU: Correct some field shadowing.

---
 GPU/Common/TextureCacheCommon.cpp | 3 ---
 GPU/Common/TextureCacheCommon.h   | 8 ++++----
 GPU/D3D11/TextureCacheD3D11.h     | 4 ----
 GPU/Directx9/TextureCacheDX9.h    | 3 ---
 GPU/GLES/TextureCacheGLES.cpp     | 1 -
 GPU/Vulkan/DrawEngineVulkan.h     | 1 -
 GPU/Vulkan/TextureCacheVulkan.h   | 4 ----
 7 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp
index 203e8eb5de..ffe3769ee2 100644
--- a/GPU/Common/TextureCacheCommon.cpp
+++ b/GPU/Common/TextureCacheCommon.cpp
@@ -100,9 +100,6 @@ inline int dimHeight(u16 dim) {
 // TODO
 TextureCacheCommon::TextureCacheCommon(Draw::DrawContext *draw)
 	: draw_(draw),
-		texelsScaledThisFrame_(0),
-		cacheSizeEstimate_(0),
-		secondCacheSizeEstimate_(0),
 		clutLastFormat_(0xFFFFFFFF),
 		clutTotalBytes_(0),
 		clutMaxBytes_(0),
diff --git a/GPU/Common/TextureCacheCommon.h b/GPU/Common/TextureCacheCommon.h
index 4ffa7f9448..e4be66c568 100644
--- a/GPU/Common/TextureCacheCommon.h
+++ b/GPU/Common/TextureCacheCommon.h
@@ -336,14 +336,14 @@ protected:
 	bool lowMemoryMode_ = false;
 
 	int decimationCounter_;
-	int texelsScaledThisFrame_;
-	int timesInvalidatedAllThisFrame_;
+	int texelsScaledThisFrame_ = 0;
+	int timesInvalidatedAllThisFrame_ = 0;
 
 	TexCache cache_;
-	u32 cacheSizeEstimate_;
+	u32 cacheSizeEstimate_ = 0;
 
 	TexCache secondCache_;
-	u32 secondCacheSizeEstimate_;
+	u32 secondCacheSizeEstimate_ = 0;
 
 	std::map<u32, int> videos_;
 
diff --git a/GPU/D3D11/TextureCacheD3D11.h b/GPU/D3D11/TextureCacheD3D11.h
index b1611936a5..f72da416ec 100644
--- a/GPU/D3D11/TextureCacheD3D11.h
+++ b/GPU/D3D11/TextureCacheD3D11.h
@@ -93,10 +93,6 @@ private:
 	ID3D11ShaderResourceView *lastBoundTexture;
 	ID3D11Buffer *depalConstants_;
 
-	int decimationCounter_;
-	int texelsScaledThisFrame_;
-	int timesInvalidatedAllThisFrame_;
-
 	FramebufferManagerD3D11 *framebufferManagerD3D11_;
 	DepalShaderCacheD3D11 *depalShaderCache_;
 	ShaderManagerD3D11 *shaderManager_;
diff --git a/GPU/Directx9/TextureCacheDX9.h b/GPU/Directx9/TextureCacheDX9.h
index 4963e3337a..d99dfd7ebc 100644
--- a/GPU/Directx9/TextureCacheDX9.h
+++ b/GPU/Directx9/TextureCacheDX9.h
@@ -86,9 +86,6 @@ private:
 	LPDIRECT3DTEXTURE9 lastBoundTexture;
 	float maxAnisotropyLevel;
 
-	int texelsScaledThisFrame_;
-	int timesInvalidatedAllThisFrame_;
-
 	FramebufferManagerDX9 *framebufferManagerDX9_;
 	DepalShaderCacheDX9 *depalShaderCache_;
 	ShaderManagerDX9 *shaderManager_;
diff --git a/GPU/GLES/TextureCacheGLES.cpp b/GPU/GLES/TextureCacheGLES.cpp
index 3a33806944..8c752ed2df 100644
--- a/GPU/GLES/TextureCacheGLES.cpp
+++ b/GPU/GLES/TextureCacheGLES.cpp
@@ -45,7 +45,6 @@
 
 TextureCacheGLES::TextureCacheGLES(Draw::DrawContext *draw)
 	: TextureCacheCommon(draw) {
-	timesInvalidatedAllThisFrame_ = 0;
 	render_ = (GLRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
 
 	SetupTextureDecoder();
diff --git a/GPU/Vulkan/DrawEngineVulkan.h b/GPU/Vulkan/DrawEngineVulkan.h
index cfc6a0f598..d72e852cc7 100644
--- a/GPU/Vulkan/DrawEngineVulkan.h
+++ b/GPU/Vulkan/DrawEngineVulkan.h
@@ -228,7 +228,6 @@ private:
 
 	PrehashMap<VertexArrayInfoVulkan *, nullptr> vai_;
 	VulkanPushBuffer *vertexCache_;
-	int decimationCounter_ = 0;
 	int descDecimationCounter_ = 0;
 
 	struct DescriptorSetKey {
diff --git a/GPU/Vulkan/TextureCacheVulkan.h b/GPU/Vulkan/TextureCacheVulkan.h
index 7f8ae32d25..364f5e202d 100644
--- a/GPU/Vulkan/TextureCacheVulkan.h
+++ b/GPU/Vulkan/TextureCacheVulkan.h
@@ -128,10 +128,6 @@ private:
 
 	TextureScalerVulkan scaler;
 
-	int decimationCounter_ = 0;
-	int texelsScaledThisFrame_ = 0;
-	int timesInvalidatedAllThisFrame_ = 0;
-
 	FramebufferManagerVulkan *framebufferManagerVulkan_;
 	DepalShaderCacheVulkan *depalShaderCache_;
 	ShaderManagerVulkan *shaderManagerVulkan_;