From 3ee36027142b6c39cb193527fb1a42504b8c5498 Mon Sep 17 00:00:00 2001
From: Marcus Wanners <marcus@wanners.net>
Date: Fri, 6 Mar 2009 18:02:41 +0000
Subject: [PATCH] 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
---
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp | 10 ++++++----
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
index 60d1495253..d32fa2a527 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
@@ -476,12 +476,14 @@ void UpdateViewport()
int scissorXOff = bpmem.scissorOffset.x * 2 - 342;
int scissorYOff = bpmem.scissorOffset.y * 2 - 342;
float fourThree = 4.0f / 3.0f;
- float wAdj, hAdj;
- float actualRatiow, actualRatioh;
- int overfl;
+ // These were commented out to fix "unreferenced local variable" compiler warnings.
+ // float wAdj, hAdj;
+ // float actualRatiow, actualRatioh;
+ // int overfl;
+ // int actualWid, actualHei;
int xoffs = 0;
int yoffs = 0;
- int wid, hei, actualWid, actualHei;
+ int wid, hei;
vp.MinZ = (xfregs.rawViewport[5] - xfregs.rawViewport[2])/16777215.0f;
vp.MaxZ = xfregs.rawViewport[5]/16777215.0f;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index a86b63f289..0b3a2e83bb 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -1086,7 +1086,7 @@ void Renderer::SwapBuffers()
if (timeGetTime() - lasttime > 1000)
{
lasttime = timeGetTime();
- s_fps = (fpscount-1);
+ s_fps = fpscount - 1;
fpscount = 0;
}