ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some compiler warnings and eol-style. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6418 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-11-14 23:56:26 +00:00
parent 0da42fcca7
commit 62a7f101a7
7 changed files with 717 additions and 717 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/VideoCommon/Src/DLCache.cpp
View File

@ -224,23 +224,23 @@ inline u64 CreateMapId(u32 address, u32 size)
inline u64 CreateVMapId(u8 VATUSED)
{
u64 vmat_id = 0;
u64 vmap_id = 0;
for(int i = 0; i < 8 ; i++)
{
if(VATUSED & (1 << i))
{
//vmat_id ^= GetHash64((u8*)(&g_VtxAttr[i].g0.),sizeof(VAT),0);
if(vmat_id != 0)
//vmap_id ^= GetHash64((u8*)(&g_VtxAttr[i].g0.),sizeof(VAT),0);
if(vmap_id != 0)
{
vmat_id ^= (((u64)g_VtxAttr[i].g0.Hex) | (((u64)g_VtxAttr[i].g1.Hex) << 32)) ^ (((u64)g_VtxAttr[i].g2.Hex) << 16);
vmap_id ^= (((u64)g_VtxAttr[i].g0.Hex) | (((u64)g_VtxAttr[i].g1.Hex) << 32)) ^ (((u64)g_VtxAttr[i].g2.Hex) << 16);
}
else
{
vmat_id = (((u64)g_VtxAttr[i].g0.Hex) | (((u64)g_VtxAttr[i].g1.Hex) << 32)) ^ (((u64)g_VtxAttr[i].g2.Hex) << 16);
vmap_id = (((u64)g_VtxAttr[i].g0.Hex) | (((u64)g_VtxAttr[i].g1.Hex) << 32)) ^ (((u64)g_VtxAttr[i].g2.Hex) << 16);
}
}
}
return vmat_id;
return vmap_id;
}
typedef std::map<u64, CachedDisplayList> DLMap;
@ -689,7 +689,6 @@ bool HandleDisplayList(u32 address, u32 size)
if (Parentiter != DLCache::dl_map.end())
{
vhash = DLCache::CreateVMapId(Parentiter->second.VATUsed);
DLCache::VDlist &tvdl = Parentiter->second;
iter = Parentiter->second.dl_map.find(vhash);
childexist = iter != Parentiter->second.dl_map.end();
}

1
Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp
View File

@ -117,6 +117,7 @@ void FramebufferManagerBase::CopyToVirtualXFB(u32 xfbAddr, u32 fbWidth, u32 fbHe
{
// create a new Virtual XFB and place it at the front of the list
VirtualXFB v;
memset(&v, 0, sizeof v);
m_virtualXFBList.push_front(v);
vxfb = m_virtualXFBList.begin();
}

4
Source/Core/VideoCommon/Src/FramebufferManagerBase.h
View File

@ -27,8 +27,8 @@ struct XFBSourceBase
u32 srcWidth;
u32 srcHeight;
int texWidth;
int texHeight;
unsigned int texWidth;
unsigned int texHeight;
// TODO: only used by OGL
TargetRectangle sourceRc;