libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-03-04 22:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7350 from unknownbrackets/warnings

Browse Source 
A few more warning fixes
This commit is contained in:
Henrik Rydgård 2015-01-18 22:33:53 +01:00
commit 416093f211
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/ABI.cpp
View File

@ -408,7 +408,7 @@ void XEmitter::ABI_CallFunctionPAA(const void *func, void *param1, const Gen::Op
MOV(64, R(ABI_PARAM1), ImmPtr(param1));
if (!arg2.IsSimpleReg(ABI_PARAM2))
MOV(32, R(ABI_PARAM2), arg2);
if (!arg2.IsSimpleReg(ABI_PARAM3))
if (!arg3.IsSimpleReg(ABI_PARAM3))
MOV(32, R(ABI_PARAM3), arg3);
u64 distance = u64(func) - (u64(code) + 5);
if (distance >= 0x0000000080000000ULL

2
GPU/Directx9/FramebufferDX9.cpp
View File

@ -876,8 +876,8 @@ namespace DX9 {
textureCache_->ForgetLastTexture();
nvfb->fbo = fbo_create(nvfb->width, nvfb->height, 1, true, (FBOColorDepth)nvfb->colorDepth);
if (!(nvfb->fbo)) {
delete nvfb;
ERROR_LOG(SCEGE, "Error creating FBO! %i x %i", nvfb->renderWidth, nvfb->renderHeight);
delete nvfb;
return;
}

2
GPU/GLES/Framebuffer.cpp
View File

@ -1195,8 +1195,8 @@ void FramebufferManager::ReadFramebufferToMemory(VirtualFramebuffer *vfb, bool s
textureCache_->ForgetLastTexture();
nvfb->fbo = fbo_create(nvfb->width, nvfb->height, 1, false, (FBOColorDepth)nvfb->colorDepth);
if (!(nvfb->fbo)) {
delete nvfb;
ERROR_LOG(SCEGE, "Error creating FBO! %i x %i", nvfb->renderWidth, nvfb->renderHeight);
delete nvfb;
return;
}

2
GPU/GLES/TextureCache.cpp
View File

@ -334,7 +334,7 @@ bool TextureCache::AttachFramebuffer(TexCacheEntry *entry, u32 address, VirtualF
if (framebuffer->fb_stride != entry->bufw) {
WARN_LOG_REPORT_ONCE(diffStrides1, G3D, "Render to texture with different strides %d != %d", entry->bufw, framebuffer->fb_stride);
}
if (entry->format != framebuffer->format) {
if (entry->format != (GETextureFormat)framebuffer->format) {
WARN_LOG_REPORT_ONCE(diffFormat1, G3D, "Render to texture with different formats %d != %d", entry->format, framebuffer->format);
// Let's avoid using it when we know the format is wrong. May be a video/etc. updating memory.
// However, some games use a different format to clear the buffer.

4
Windows/W32Util/ShellUtil.cpp
View File

@ -64,8 +64,8 @@ namespace W32Util
ofn.hwndOwner = _hParent;
ofn.Flags = OFN_NOCHANGEDIR | OFN_EXPLORER | OFN_HIDEREADONLY;
if (_strFileName.size () != 0)
wcscpy(ofn.lpstrFile, ConvertUTF8ToWString(_strFileName).c_str());
if (!_strFileName.empty())
wcsncpy(ofn.lpstrFile, ConvertUTF8ToWString(_strFileName).c_str(), MAX_PATH);
if (((_bLoad) ? GetOpenFileName(&ofn) : GetSaveFileName (&ofn)))
{

4
Windows/W32Util/TabControl.cpp
View File

@ -43,7 +43,7 @@ HWND TabControl::AddTabWindow(wchar_t* className, wchar_t* title, DWORD style)
info.lastFocus = tabHandle;
info.pageHandle = tabHandle;
wcscpy(info.title,title);
wcscpy_s(info.title,title);
tabs.push_back(info);
ShowTab(index);
@ -87,7 +87,7 @@ void TabControl::AddTab(HWND handle, wchar_t* title)
info.lastFocus = handle;
info.pageHandle = handle;
wcscpy(info.title,title);
wcscpy_s(info.title,title);
tabs.push_back(info);
ShowTab(index);