From b5e4f7f6229fcf9024b6d714ce433c0533ea6a66 Mon Sep 17 00:00:00 2001 From: "j4ck.fr0st" Date: Sun, 14 Nov 2010 15:12:07 +0000 Subject: [PATCH] OSX buildfix git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6410 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/Src/DLCache.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/Src/DLCache.cpp b/Source/Core/VideoCommon/Src/DLCache.cpp index c2509f988c..e2e0da7280 100644 --- a/Source/Core/VideoCommon/Src/DLCache.cpp +++ b/Source/Core/VideoCommon/Src/DLCache.cpp @@ -224,23 +224,23 @@ inline u64 CreateMapId(u32 address, u32 size) inline u64 CreateVMapId(u8 VATUSED) { - u64 id = 0; + u64 vmat_id = 0; for(int i = 0; i < 8 ; i++) { if(VATUSED & (1 << i)) { - //id ^= GetHash64((u8*)(&g_VtxAttr[i].g0.),sizeof(VAT),0); - if(id != 0) + //vmat_id ^= GetHash64((u8*)(&g_VtxAttr[i].g0.),sizeof(VAT),0); + if(vmat_id != 0) { - id ^= (g_VtxAttr[i].g0.Hex | (g_VtxAttr[i].g1.Hex << 32)) ^ (g_VtxAttr[i].g2.Hex << 16); + vmat_id ^= (g_VtxAttr[i].g0.Hex | (g_VtxAttr[i].g1.Hex << 32)) ^ (g_VtxAttr[i].g2.Hex << 16); } else { - id = (g_VtxAttr[i].g0.Hex | (g_VtxAttr[i].g1.Hex << 32)) ^ (g_VtxAttr[i].g2.Hex << 16); + vmat_id = (g_VtxAttr[i].g0.Hex | (g_VtxAttr[i].g1.Hex << 32)) ^ (g_VtxAttr[i].g2.Hex << 16); } } } - return id; + return vmat_id; } typedef std::map DLMap;