Fixed more compiler warnings, and revised the syntax of the fix of r2567.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2570 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
658679876e
commit
3ee3602714
|
@ -476,12 +476,14 @@ void UpdateViewport()
|
||||||
int scissorXOff = bpmem.scissorOffset.x * 2 - 342;
|
int scissorXOff = bpmem.scissorOffset.x * 2 - 342;
|
||||||
int scissorYOff = bpmem.scissorOffset.y * 2 - 342;
|
int scissorYOff = bpmem.scissorOffset.y * 2 - 342;
|
||||||
float fourThree = 4.0f / 3.0f;
|
float fourThree = 4.0f / 3.0f;
|
||||||
float wAdj, hAdj;
|
// These were commented out to fix "unreferenced local variable" compiler warnings.
|
||||||
float actualRatiow, actualRatioh;
|
// float wAdj, hAdj;
|
||||||
int overfl;
|
// float actualRatiow, actualRatioh;
|
||||||
|
// int overfl;
|
||||||
|
// int actualWid, actualHei;
|
||||||
int xoffs = 0;
|
int xoffs = 0;
|
||||||
int yoffs = 0;
|
int yoffs = 0;
|
||||||
int wid, hei, actualWid, actualHei;
|
int wid, hei;
|
||||||
|
|
||||||
vp.MinZ = (xfregs.rawViewport[5] - xfregs.rawViewport[2])/16777215.0f;
|
vp.MinZ = (xfregs.rawViewport[5] - xfregs.rawViewport[2])/16777215.0f;
|
||||||
vp.MaxZ = xfregs.rawViewport[5]/16777215.0f;
|
vp.MaxZ = xfregs.rawViewport[5]/16777215.0f;
|
||||||
|
|
|
@ -1086,7 +1086,7 @@ void Renderer::SwapBuffers()
|
||||||
if (timeGetTime() - lasttime > 1000)
|
if (timeGetTime() - lasttime > 1000)
|
||||||
{
|
{
|
||||||
lasttime = timeGetTime();
|
lasttime = timeGetTime();
|
||||||
s_fps = (fpscount-1);
|
s_fps = fpscount - 1;
|
||||||
fpscount = 0;
|
fpscount = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue