Fix some shadowing warnings.

dolphin-emu · Jan 29, 2013 · 0e04e0c · 0e04e0c
1 parent f13a07f
commit 0e04e0c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_LoadStore.cpp
@@ -139,8 +139,8 @@ void Jit64::lXXx(UGeckoInstruction inst)
 		MOV(32, gpr.R(d), R(EAX));
 		gpr.UnlockAll();
 
-		gpr.Flush(FLUSH_ALL); 
-    fpr.Flush(FLUSH_ALL);
+		gpr.Flush(FLUSH_ALL);
+		fpr.Flush(FLUSH_ALL);
 
 		// if it's still 0, we can wait until the next event
 		TEST(32, R(EAX), R(EAX));

diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.h b/Source/Core/VideoCommon/Src/TextureCacheBase.h
@@ -60,26 +60,26 @@ class TextureCache
 		int frameCount;
 
 
-		void SetGeneralParameters(u32 addr, u32 size, u32 format, unsigned int num_mipmaps)
+		void SetGeneralParameters(u32 _addr, u32 _size, u32 _format, unsigned int _num_mipmaps)
 		{
-			this->addr = addr;
-			this->size_in_bytes = size;
-			this->format = format;
-			this->num_mipmaps = num_mipmaps;
+			addr = _addr;
+			size_in_bytes = _size;
+			format = _format;
+			num_mipmaps = _num_mipmaps;
 		}
 
-		void SetDimensions(unsigned int native_width, unsigned int native_height, unsigned int virtual_width, unsigned int virtual_height)
+		void SetDimensions(unsigned int _native_width, unsigned int _native_height, unsigned int _virtual_width, unsigned int _virtual_height)
 		{
-			this->native_width = native_width;
-			this->native_height = native_height;
-			this->virtual_width = virtual_width;
-			this->virtual_height = virtual_height;
+			native_width = _native_width;
+			native_height = _native_height;
+			virtual_width = _virtual_width;
+			virtual_height = _virtual_height;
 		}
 
-		void SetHashes(u64 hash/*, u32 pal_hash*/)
+		void SetHashes(u64 _hash/*, u32 _pal_hash*/)
 		{
-			this->hash = hash;
-			//this->pal_hash = pal_hash;
+			hash = _hash;
+			//pal_hash = _pal_hash;
 		}
 
 

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -1289,10 +1289,10 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
 	if (FramebufferManagerBase::LastXfbWidth() != fbWidth || FramebufferManagerBase::LastXfbHeight() != fbHeight)
 	{
 		xfbchanged = true;
-		unsigned int w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth;
-		unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight;
-		FramebufferManagerBase::SetLastXfbWidth(w);
-		FramebufferManagerBase::SetLastXfbHeight(h);
+		unsigned int const last_w = (fbWidth < 1 || fbWidth > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbWidth;
+		unsigned int const last_h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight;
+		FramebufferManagerBase::SetLastXfbWidth(last_w);
+		FramebufferManagerBase::SetLastXfbHeight(last_h);
 	}
 
 	bool WindowResized = false;

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
@@ -330,15 +330,15 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
 			srcRect);
 
 		u8* dst = Memory::GetPointer(addr);
-		u64 hash = GetHash64(dst,encoded_size,g_ActiveConfig.iSafeTextureCache_ColorSamples);
+		u64 const new_hash = GetHash64(dst,encoded_size,g_ActiveConfig.iSafeTextureCache_ColorSamples);
 
 		// Mark texture entries in destination address range dynamic unless caching is enabled and the texture entry is up to date
 		if (!g_ActiveConfig.bEFBCopyCacheEnable)
 			TextureCache::MakeRangeDynamic(addr,encoded_size);
-		else if (!TextureCache::Find(addr, hash))
+		else if (!TextureCache::Find(addr, new_hash))
 			TextureCache::MakeRangeDynamic(addr,encoded_size);
 
-		this->hash = hash;
+		hash = new_hash;
 	}
 
     FramebufferManager::SetFramebuffer(0);