From a85e9f14558bbbd72e31acce046d1983890676dc Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Mon, 20 Dec 2010 17:20:31 +0000 Subject: [PATCH] Fix shadowing like in DX9.. Not sure if the previous commit broke anything, but better be safe.. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6629 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index 4c790024d1..2d34bf33da 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -373,9 +373,10 @@ u64 EncodeToRamFromTexture(u32 address,GLuint source_texture, bool bFromZBuffer, dest_ptr, expandedWidth / samples, expandedHeight, readStride, true, bScaleByHalf > 0 && !bFromZBuffer); + u64 hash = 0; if (g_ActiveConfig.bEFBCopyCacheEnable) { - u64 hash = GetHash64(dest_ptr, size_in_bytes, + hash = GetHash64(dest_ptr, size_in_bytes, g_ActiveConfig.iSafeTextureCache_ColorSamples); // If the texture in RAM is already in the texture cache, @@ -385,7 +386,7 @@ u64 EncodeToRamFromTexture(u32 address,GLuint source_texture, bool bFromZBuffer, } TextureCache::MakeRangeDynamic(address,size_in_bytes); - return 0; + return hash; } void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, u8* destAddr, int dstWidth, int dstHeight)