Archive/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-08 03:28:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unnecessary shadow variables and signed/unsigned comparisons.

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6244 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-10-01 12:38:31 +00:00
parent 23f8da4bf7
commit c8c805f720
6 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Common/Src/NandPaths.cpp
View file

@ -21,6 +21,7 @@
namespace Common namespace Common
{ {
std::string CreateTicketFileName(u64 _titleID) std::string CreateTicketFileName(u64 _titleID)
{ {
char TicketFilename[1024]; char TicketFilename[1024];
@ -85,4 +86,5 @@ bool CheckTitleTIK(u64 _titleID)
INFO_LOG(DISCIO, "Invalid or no tik for title %08x %08x", (u32)(_titleID >> 32), (u32)(_titleID & 0xFFFFFFFF)); INFO_LOG(DISCIO, "Invalid or no tik for title %08x %08x", (u32)(_titleID >> 32), (u32)(_titleID & 0xFFFFFFFF));
return false; return false;
} }
};
};

2
Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
View file

@ -500,7 +500,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
js.downcountAmount = 0; js.downcountAmount = 0;
if (!Core::g_CoreStartupParameter.bEnableDebugging) if (!Core::g_CoreStartupParameter.bEnableDebugging)
{ {
for (unsigned int i = 0; i < size_of_merged_addresses; ++i) for (int i = 0; i < size_of_merged_addresses; ++i)
{ {
const u32 address = merged_addresses[i]; const u32 address = merged_addresses[i];
js.downcountAmount += PatchEngine::GetSpeedhackCycles(address); js.downcountAmount += PatchEngine::GetSpeedhackCycles(address);

2
Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp
View file

@ -474,7 +474,7 @@ const u8* JitIL::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
js.downcountAmount = 0; js.downcountAmount = 0;
if (!Core::g_CoreStartupParameter.bEnableDebugging) if (!Core::g_CoreStartupParameter.bEnableDebugging)
{ {
for (unsigned int i = 0; i < size_of_merged_addresses; ++i) for (int i = 0; i < size_of_merged_addresses; ++i)
{ {
const u32 address = merged_addresses[i]; const u32 address = merged_addresses[i];
js.downcountAmount += PatchEngine::GetSpeedhackCycles(address); js.downcountAmount += PatchEngine::GetSpeedhackCycles(address);

6
Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
View file

@ -361,10 +361,10 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa,
if (it != inserted_asm_codes.end()) if (it != inserted_asm_codes.end())
{ {
const std::vector<u32>& codes = it->second; const std::vector<u32>& codes = it->second;
for (std::vector<u32>::const_iterator it = codes.begin(), for (std::vector<u32>::const_iterator itCur = codes.begin(),
itEnd = codes.end(); it != itEnd; ++it) itEnd = codes.end(); itCur != itEnd; ++itCur)
{ {
cst1_instructions.push(*it); cst1_instructions.push(*itCur);
} }
inst = UGeckoInstruction(cst1_instructions.front()); inst = UGeckoInstruction(cst1_instructions.front());
cst1_instructions.pop(); cst1_instructions.pop();

2
Source/Plugins/Plugin_VideoOGL/Src/Globals.h
View file

@ -27,4 +27,4 @@
// A global plugin specification // A global plugin specification
extern PLUGIN_GLOBALS* globals; extern PLUGIN_GLOBALS* globals;
#endif // _GLOBALS_H_ #endif // _GLOBALS_H_

7
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View file

@ -94,7 +94,7 @@ static int s_MSAACoverageSamples = 0;
bool s_bHaveFramebufferBlit = false; // export to FramebufferManager.cpp bool s_bHaveFramebufferBlit = false; // export to FramebufferManager.cpp
static bool s_bHaveCoverageMSAA = false; static bool s_bHaveCoverageMSAA = false;
static u32 s_blendMode; static u32 s_blendMode;
static u32 s_LastEFBScale; static int s_LastEFBScale;
static volatile bool s_bScreenshot = false; static volatile bool s_bScreenshot = false;
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
@ -951,8 +951,8 @@ void UpdateViewport()
int scissorXOff = bpmem.scissorOffset.x * 2; int scissorXOff = bpmem.scissorOffset.x * 2;
int scissorYOff = bpmem.scissorOffset.y * 2; int scissorYOff = bpmem.scissorOffset.y * 2;
int Xstride = (s_Fulltarget_width - s_target_width) / 2; // int Xstride = (s_Fulltarget_width - s_target_width) / 2;
int Ystride = (s_Fulltarget_height - s_target_height) / 2; // int Ystride = (s_Fulltarget_height - s_target_height) / 2;
// Stretch picture with increased internal resolution // Stretch picture with increased internal resolution
int X = (int)ceil((xfregs.rawViewport[3] - xfregs.rawViewport[0] - float(scissorXOff)) * EFBxScale); int X = (int)ceil((xfregs.rawViewport[3] - xfregs.rawViewport[0] - float(scissorXOff)) * EFBxScale);
@ -1382,7 +1382,6 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons
if (xfbchanged || WindowResized) if (xfbchanged || WindowResized)
{ {
TargetRectangle dst_rect;
ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect); ComputeDrawRectangle(s_backbuffer_width, s_backbuffer_height, false, &dst_rect);
if(g_ActiveConfig.bUseRealXFB) if(g_ActiveConfig.bUseRealXFB)