The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 23:11:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

quiet some warnings which appear on vs2015.

Browse Source 
quieted warnings include shadowed variable names and integer extensions.
This commit is contained in:
Shawn Hoffman 2015-03-15 19:28:47 -07:00
parent 7cda374910
commit ad64336137
15 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Externals/wxWidgets3/build/msw/wx_base.vcxproj vendored
View File

@ -1271,6 +1271,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\..\..\Source\VSProps\Base.props" /> <Import Project="..\..\..\..\Source\VSProps\Base.props" />
<Import Project="..\..\..\..\Source\VSProps\WXWOverrides.props" /> <Import Project="..\..\..\..\Source\VSProps\WXWOverrides.props" />
<Import Project="..\..\..\..\Source\VSProps\ClDisableAllWarnings.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'"> <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">

2
Externals/wxWidgets3/include/wx/app.h vendored
View File

@ -541,7 +541,7 @@ public:
// very first initialization function // very first initialization function
// //
// Override: very rarely // Override: very rarely
virtual bool Initialize(int& argc, wxChar **argv); virtual bool Initialize(int& _argc, wxChar **_argv);
// a platform-dependent version of OnInit(): the code here is likely to // a platform-dependent version of OnInit(): the code here is likely to
// depend on the toolkit. default version does nothing. // depend on the toolkit. default version does nothing.

2
Externals/wxWidgets3/include/wx/msw/app.h vendored
View File

@ -29,7 +29,7 @@ public:
virtual ~wxApp(); virtual ~wxApp();
// override base class (pure) virtuals // override base class (pure) virtuals
virtual bool Initialize(int& argc, wxChar **argv); virtual bool Initialize(int& _argc, wxChar **_argv);
virtual void CleanUp(); virtual void CleanUp();
virtual void WakeUpIdle(); virtual void WakeUpIdle();

2
Source/Core/Core/PowerPC/Jit64/Jit.h
View File

@ -71,7 +71,7 @@ public:
// Jit! // Jit!
void Jit(u32 em_address) override; void Jit(u32 em_address) override;
const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b, u32 nextPC); const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b, u32 nextPC);
BitSet32 CallerSavedRegistersInUse(); BitSet32 CallerSavedRegistersInUse();

2
Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
View File

@ -1525,7 +1525,7 @@ void Jit64::rlwimix(UGeckoInstruction inst)
bool isRightShift = mask == (1U << inst.SH) - 1; bool isRightShift = mask == (1U << inst.SH) - 1;
if (gpr.R(a).IsImm()) if (gpr.R(a).IsImm())
{ {
u32 maskA = gpr.R(a).offset & ~mask; u32 maskA = (u32)gpr.R(a).offset & ~mask;
gpr.BindToRegister(a, false, true); gpr.BindToRegister(a, false, true);
MOV(32, gpr.R(a), gpr.R(s)); MOV(32, gpr.R(a), gpr.R(s));
if (isLeftShift) if (isLeftShift)

2
Source/Core/Core/PowerPC/Jit64IL/JitIL.h
View File

@ -54,7 +54,7 @@ public:
// Jit! // Jit!
void Jit(u32 em_address) override; void Jit(u32 em_address) override;
const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buffer, JitBlock *b, u32 nextPC); const u8* DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBlock *b, u32 nextPC);
void Trace(); void Trace();

2
Source/Core/DolphinWX/GameListCtrl.cpp
View File

@ -402,7 +402,7 @@ static wxString NiceSizeFormat(u64 _size)
// div 10 to get largest named unit less than _size // div 10 to get largest named unit less than _size
// 10 == log2(1024) (number of B in a KiB, KiB in a MiB, etc) // 10 == log2(1024) (number of B in a KiB, KiB in a MiB, etc)
const u64 unit = IntLog2(std::max<u64>(_size, 1)) / 10; const u64 unit = IntLog2(std::max<u64>(_size, 1)) / 10;
const u64 unit_size = (1 << (unit * 10)); const u64 unit_size = (1ull << (unit * 10));
// mul 1000 for 3 decimal places, add 5 to round up, div 10 for 2 decimal places // mul 1000 for 3 decimal places, add 5 to round up, div 10 for 2 decimal places
std::string value = std::to_string((_size * 1000 / unit_size + 5) / 10); std::string value = std::to_string((_size * 1000 / unit_size + 5) / 10);

24
Source/Core/VideoBackends/D3D/D3DBase.cpp
View File

@ -154,41 +154,41 @@ void UnloadD3DCompiler()
std::vector<DXGI_SAMPLE_DESC> EnumAAModes(IDXGIAdapter* adapter) std::vector<DXGI_SAMPLE_DESC> EnumAAModes(IDXGIAdapter* adapter)
{ {
std::vector<DXGI_SAMPLE_DESC> aa_modes; std::vector<DXGI_SAMPLE_DESC> _aa_modes;
// NOTE: D3D 10.0 doesn't support multisampled resources which are bound as depth buffers AND shader resources. // NOTE: D3D 10.0 doesn't support multisampled resources which are bound as depth buffers AND shader resources.
// Thus, we can't have MSAA with 10.0 level hardware. // Thus, we can't have MSAA with 10.0 level hardware.
ID3D11Device* device; ID3D11Device* _device;
ID3D11DeviceContext* context; ID3D11DeviceContext* _context;
D3D_FEATURE_LEVEL feat_level; D3D_FEATURE_LEVEL feat_level;
HRESULT hr = PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr, D3D11_CREATE_DEVICE_SINGLETHREADED, supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, &device, &feat_level, &context); HRESULT hr = PD3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, nullptr, D3D11_CREATE_DEVICE_SINGLETHREADED, supported_feature_levels, NUM_SUPPORTED_FEATURE_LEVELS, D3D11_SDK_VERSION, &_device, &feat_level, &_context);
if (FAILED(hr) || feat_level == D3D_FEATURE_LEVEL_10_0) if (FAILED(hr) || feat_level == D3D_FEATURE_LEVEL_10_0)
{ {
DXGI_SAMPLE_DESC desc; DXGI_SAMPLE_DESC desc;
desc.Count = 1; desc.Count = 1;
desc.Quality = 0; desc.Quality = 0;
aa_modes.push_back(desc); _aa_modes.push_back(desc);
SAFE_RELEASE(context); SAFE_RELEASE(_context);
SAFE_RELEASE(device); SAFE_RELEASE(_device);
} }
else else
{ {
for (int samples = 0; samples < D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; ++samples) for (int samples = 0; samples < D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT; ++samples)
{ {
UINT quality_levels = 0; UINT quality_levels = 0;
device->CheckMultisampleQualityLevels(DXGI_FORMAT_R8G8B8A8_UNORM, samples, &quality_levels); _device->CheckMultisampleQualityLevels(DXGI_FORMAT_R8G8B8A8_UNORM, samples, &quality_levels);
if (quality_levels > 0) if (quality_levels > 0)
{ {
DXGI_SAMPLE_DESC desc; DXGI_SAMPLE_DESC desc;
desc.Count = samples; desc.Count = samples;
for (desc.Quality = 0; desc.Quality < quality_levels; ++desc.Quality) for (desc.Quality = 0; desc.Quality < quality_levels; ++desc.Quality)
aa_modes.push_back(desc); _aa_modes.push_back(desc);
} }
} }
context->Release(); _context->Release();
device->Release(); _device->Release();
} }
return aa_modes; return _aa_modes;
} }
D3D_FEATURE_LEVEL GetFeatureLevel(IDXGIAdapter* adapter) D3D_FEATURE_LEVEL GetFeatureLevel(IDXGIAdapter* adapter)

6
Source/Core/VideoBackends/D3D/D3DUtil.cpp
View File

@ -399,10 +399,10 @@ int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dw
D3D::context->Draw(3 * dwNumTriangles, 0); D3D::context->Draw(3 * dwNumTriangles, 0);
dwNumTriangles = 0; dwNumTriangles = 0;
D3D11_MAPPED_SUBRESOURCE vbmap; D3D11_MAPPED_SUBRESOURCE _vbmap;
hr = context->Map(m_pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &vbmap); hr = context->Map(m_pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &_vbmap);
if (FAILED(hr)) PanicAlert("Mapping vertex buffer failed, %s %d\n", __FILE__, __LINE__); if (FAILED(hr)) PanicAlert("Mapping vertex buffer failed, %s %d\n", __FILE__, __LINE__);
pVertices = (D3D::FONT2DVERTEX*)vbmap.pData; pVertices = (D3D::FONT2DVERTEX*)_vbmap.pData;
} }
sx += w + spacing * scalex * size; sx += w + spacing * scalex * size;
} }

8
Source/Core/VideoBackends/D3D/Render.cpp
View File

@ -872,10 +872,10 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
if (FramebufferManagerBase::LastXfbWidth() != fbStride || FramebufferManagerBase::LastXfbHeight() != fbHeight) if (FramebufferManagerBase::LastXfbWidth() != fbStride || FramebufferManagerBase::LastXfbHeight() != fbHeight)
{ {
xfbchanged = true; xfbchanged = true;
unsigned int w = (fbStride < 1 || fbStride > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbStride; unsigned int xfb_w = (fbStride < 1 || fbStride > MAX_XFB_WIDTH) ? MAX_XFB_WIDTH : fbStride;
unsigned int h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight; unsigned int xfb_h = (fbHeight < 1 || fbHeight > MAX_XFB_HEIGHT) ? MAX_XFB_HEIGHT : fbHeight;
FramebufferManagerBase::SetLastXfbWidth(w); FramebufferManagerBase::SetLastXfbWidth(xfb_w);
FramebufferManagerBase::SetLastXfbHeight(h); FramebufferManagerBase::SetLastXfbHeight(xfb_h);
} }
// Flip/present backbuffer to frontbuffer here // Flip/present backbuffer to frontbuffer here

6
Source/Core/VideoBackends/D3D/TextureCache.cpp
View File

@ -65,7 +65,7 @@ bool TextureCache::TCacheEntry::Save(const std::string& filename, unsigned int l
D3D::context->CopyResource(pNewTexture, pSurface); D3D::context->CopyResource(pNewTexture, pSurface);
D3D11_MAPPED_SUBRESOURCE map; D3D11_MAPPED_SUBRESOURCE map;
HRESULT hr = D3D::context->Map(pNewTexture, 0, D3D11_MAP_READ_WRITE, 0, &map); hr = D3D::context->Map(pNewTexture, 0, D3D11_MAP_READ_WRITE, 0, &map);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
saved_png = TextureToPng((u8*)map.pData, map.RowPitch, filename, desc.Width, desc.Height); saved_png = TextureToPng((u8*)map.pData, map.RowPitch, filename, desc.Width, desc.Height);
@ -177,13 +177,11 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
u8* dst = Memory::GetPointer(dstAddr); u8* dst = Memory::GetPointer(dstAddr);
size_t encoded_size = g_encoder->Encode(dst, dstFormat, srcFormat, srcRect, isIntensity, scaleByHalf); size_t encoded_size = g_encoder->Encode(dst, dstFormat, srcFormat, srcRect, isIntensity, scaleByHalf);
u64 hash = GetHash64(dst, (int)encoded_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
size_in_bytes = (u32)encoded_size; size_in_bytes = (u32)encoded_size;
TextureCache::MakeRangeDynamic(dstAddr, (u32)encoded_size); TextureCache::MakeRangeDynamic(dstAddr, (u32)encoded_size);
this->hash = hash; this->hash = GetHash64(dst, (int)encoded_size, g_ActiveConfig.iSafeTextureCache_ColorSamples);
} }
} }

2
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
View File

@ -1912,7 +1912,7 @@ namespace GLExtensions
*func = dlsym(RTLD_NEXT, name.c_str()); *func = dlsym(RTLD_NEXT, name.c_str());
#endif #endif
if (*func == nullptr && _isES) if (*func == nullptr && _isES)
*func = (void*)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on *func = (void*)(uintptr_t)0xFFFFFFFF; // Easy to determine invalid function, just so we continue on
if (*func == nullptr) if (*func == nullptr)
ERROR_LOG(VIDEO, "Couldn't load function %s", name.c_str()); ERROR_LOG(VIDEO, "Couldn't load function %s", name.c_str());
} }

2
Source/Core/VideoCommon/TextureCacheBase.h
View File

@ -104,7 +104,7 @@ public:
// Removes textures which aren't used for more than TEXTURE_KILL_THRESHOLD frames, // Removes textures which aren't used for more than TEXTURE_KILL_THRESHOLD frames,
// frameCount is the current frame number. // frameCount is the current frame number.
static void Cleanup(int frameCount); static void Cleanup(int _frameCount);
static void Invalidate(); static void Invalidate();
static void MakeRangeDynamic(u32 start_address, u32 size); static void MakeRangeDynamic(u32 start_address, u32 size);

1
Source/VSProps/WXWOverrides.props
View File

@ -8,7 +8,6 @@
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
<ExceptionHandling>Async</ExceptionHandling> <ExceptionHandling>Async</ExceptionHandling>
<DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<PreprocessorDefinitions>__WXMSW__;WXBUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>__WXMSW__;WXBUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\xxhash;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\xxhash;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>