From b39a57204390aa3c14680db6162cca0cf8151553 Mon Sep 17 00:00:00 2001 From: Sacha Date: Sun, 2 Jun 2013 13:26:39 +1000 Subject: [PATCH] Buildfixes. Fix C++11 usage. Remove redundancy. Fix st_*time re-usage. --- Common/FileSearch.cpp | 1 - Common/KeyMap.cpp | 3 -- Common/MemArena.cpp | 1 - Core/CoreTiming.h | 2 -- Core/Debugger/SymbolMap.cpp | 2 -- Core/Dialog/SavedataParam.h | 3 ++ Core/ELF/ParamSFO.cpp | 1 - Core/ELF/ParamSFO.h | 2 +- Core/ELF/PrxDecrypter.cpp | 2 -- Core/FileSystems/BlockDevices.h | 2 -- Core/FileSystems/DirectoryFileSystem.h | 1 - Core/FileSystems/FileSystem.h | 1 - Core/FileSystems/ISOFileSystem.h | 2 -- Core/HLE/sceKernel.h | 1 - Core/HLE/sceKernelModule.cpp | 1 - Core/HW/OMAConvert.cpp | 1 - Core/Host.h | 2 -- Core/Util/BlockAllocator.h | 2 -- GPU/GLES/TextureScaler.cpp | 39 ++++++++++---------------- GPU/GPUState.h | 1 - Globals.h | 1 + ffmpeg | 2 +- native | 2 +- 23 files changed, 22 insertions(+), 53 deletions(-) diff --git a/Common/FileSearch.cpp b/Common/FileSearch.cpp index aa836a166f..3d8e07d852 100644 --- a/Common/FileSearch.cpp +++ b/Common/FileSearch.cpp @@ -28,7 +28,6 @@ #ifdef __APPLE__ #include #endif -#include #include "FileSearch.h" diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index 758b135fed..8297f71205 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -15,9 +15,6 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. -#include -#include - #include "input/input_state.h" #include "Core/Config.h" #include "KeyMap.h" diff --git a/Common/MemArena.cpp b/Common/MemArena.cpp index 3cd996fea0..b8191b0808 100644 --- a/Common/MemArena.cpp +++ b/Common/MemArena.cpp @@ -15,7 +15,6 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ -#include "Common.h" #include "MemoryUtil.h" #include "MemArena.h" diff --git a/Core/CoreTiming.h b/Core/CoreTiming.h index d4bdd12aca..8d8281f6c8 100644 --- a/Core/CoreTiming.h +++ b/Core/CoreTiming.h @@ -33,8 +33,6 @@ #include "../Globals.h" -#include - class PointerWrap; //const int CPU_HZ = 222000000; diff --git a/Core/Debugger/SymbolMap.cpp b/Core/Debugger/SymbolMap.cpp index 5d08b3a521..711dbfaa44 100644 --- a/Core/Debugger/SymbolMap.cpp +++ b/Core/Debugger/SymbolMap.cpp @@ -22,14 +22,12 @@ #include #endif -#include #include #include "../../Globals.h" #include "../../Core/MemMap.h" #include "SymbolMap.h" -#include #include SymbolMap symbolMap; diff --git a/Core/Dialog/SavedataParam.h b/Core/Dialog/SavedataParam.h index d4ad023815..b25e4039e0 100644 --- a/Core/Dialog/SavedataParam.h +++ b/Core/Dialog/SavedataParam.h @@ -20,6 +20,9 @@ #include "Core/HLE/sceKernel.h" #include "Core/HLE/sceRtc.h" #include "Core/System.h" +#undef st_ctime +#undef st_atime +#undef st_mtime enum SceUtilitySavedataType { diff --git a/Core/ELF/ParamSFO.cpp b/Core/ELF/ParamSFO.cpp index cfbe1ecc21..7757f61b7e 100644 --- a/Core/ELF/ParamSFO.cpp +++ b/Core/ELF/ParamSFO.cpp @@ -17,7 +17,6 @@ #include #include -#include "../Globals.h" #include "ParamSFO.h" struct Header diff --git a/Core/ELF/ParamSFO.h b/Core/ELF/ParamSFO.h index 85686a256a..90d2a516e7 100644 --- a/Core/ELF/ParamSFO.h +++ b/Core/ELF/ParamSFO.h @@ -18,10 +18,10 @@ #pragma once -#include #include #include "Common/CommonTypes.h" +#include "../Globals.h" class ParamSFOData { diff --git a/Core/ELF/PrxDecrypter.cpp b/Core/ELF/PrxDecrypter.cpp index f9a643463b..7d7bf9ef4b 100644 --- a/Core/ELF/PrxDecrypter.cpp +++ b/Core/ELF/PrxDecrypter.cpp @@ -1,5 +1,3 @@ -#include - extern "C" { #include "ext/libkirk/kirk_engine.h" diff --git a/Core/FileSystems/BlockDevices.h b/Core/FileSystems/BlockDevices.h index e4cff8abac..baa34111d5 100644 --- a/Core/FileSystems/BlockDevices.h +++ b/Core/FileSystems/BlockDevices.h @@ -23,8 +23,6 @@ // The ISOFileSystemReader reads from a BlockDevice, so it automatically works // with CISO images. -#include - #include "../../Globals.h" #include "Core/ELF/PBPReader.h" diff --git a/Core/FileSystems/DirectoryFileSystem.h b/Core/FileSystems/DirectoryFileSystem.h index 1ee0ac474a..d7bd082535 100644 --- a/Core/FileSystems/DirectoryFileSystem.h +++ b/Core/FileSystems/DirectoryFileSystem.h @@ -20,7 +20,6 @@ // TODO: Remove the Windows-specific code, FILE is fine there too. #include -#include #include "../Core/FileSystems/FileSystem.h" diff --git a/Core/FileSystems/FileSystem.h b/Core/FileSystems/FileSystem.h index 6f3c447acf..3fed1c855a 100644 --- a/Core/FileSystems/FileSystem.h +++ b/Core/FileSystems/FileSystem.h @@ -19,7 +19,6 @@ #include "../../Globals.h" #include "ChunkFile.h" -#include enum FileAccess { diff --git a/Core/FileSystems/ISOFileSystem.h b/Core/FileSystems/ISOFileSystem.h index 66bfbd1693..7555e993ae 100644 --- a/Core/FileSystems/ISOFileSystem.h +++ b/Core/FileSystems/ISOFileSystem.h @@ -18,9 +18,7 @@ #pragma once #include -#include #include -#include #include "FileSystem.h" diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h index 3c1da12fb8..53dde68286 100644 --- a/Core/HLE/sceKernel.h +++ b/Core/HLE/sceKernel.h @@ -19,7 +19,6 @@ #include "../../Globals.h" #include "Common.h" -#include #include class PointerWrap; diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index c542b4cbd8..1a1e394615 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -17,7 +17,6 @@ #include #include -#include #include "Core/HLE/HLE.h" #include "Core/HLE/HLETables.h" diff --git a/Core/HW/OMAConvert.cpp b/Core/HW/OMAConvert.cpp index 7ace225257..71a1cd9bb4 100644 --- a/Core/HW/OMAConvert.cpp +++ b/Core/HW/OMAConvert.cpp @@ -1,5 +1,4 @@ #include "OMAConvert.h" -#include namespace OMAConvert { diff --git a/Core/Host.h b/Core/Host.h index 07611b22e7..626f35a08d 100644 --- a/Core/Host.h +++ b/Core/Host.h @@ -17,8 +17,6 @@ #pragma once -#include -#include #include "../Globals.h" struct InputState; diff --git a/Core/Util/BlockAllocator.h b/Core/Util/BlockAllocator.h index 4d7b7a1ee9..ec512e6c98 100644 --- a/Core/Util/BlockAllocator.h +++ b/Core/Util/BlockAllocator.h @@ -19,9 +19,7 @@ #include "../../Globals.h" -#include #include -#include class PointerWrap; diff --git a/GPU/GLES/TextureScaler.cpp b/GPU/GLES/TextureScaler.cpp index d8a6564432..6227564945 100644 --- a/GPU/GLES/TextureScaler.cpp +++ b/GPU/GLES/TextureScaler.cpp @@ -28,15 +28,6 @@ #include #include -#ifdef __SYMBIAN32__ -#define p -#elif defined(IOS) -#include -namespace p = std::tr1::placeholders; -#else -namespace p = std::placeholders; -#endif - #if _M_SSE >= 0x402 #include #endif @@ -604,22 +595,22 @@ void TextureScaler::Scale(u32* &data, GLenum &dstFmt, int &width, int &height, i void TextureScaler::ScaleXBRZ(int factor, u32* source, u32* dest, int width, int height) { xbrz::ScalerCfg cfg; - GlobalThreadPool::Loop(bind(&xbrz::scale, factor, source, dest, width, height, cfg, p::_1, p::_2), 0, height); + GlobalThreadPool::Loop(bind(&xbrz::scale, factor, source, dest, width, height, cfg, placeholder::_1, placeholder::_2), 0, height); } void TextureScaler::ScaleBilinear(int factor, u32* source, u32* dest, int width, int height) { bufTmp1.resize(width*height*factor); u32 *tmpBuf = bufTmp1.data(); - GlobalThreadPool::Loop(bind(&bilinearH, factor, source, tmpBuf, width, p::_1, p::_2), 0, height); - GlobalThreadPool::Loop(bind(&bilinearV, factor, tmpBuf, dest, width, 0, height, p::_1, p::_2), 0, height); + GlobalThreadPool::Loop(bind(&bilinearH, factor, source, tmpBuf, width, placeholder::_1, placeholder::_2), 0, height); + GlobalThreadPool::Loop(bind(&bilinearV, factor, tmpBuf, dest, width, 0, height, placeholder::_1, placeholder::_2), 0, height); } void TextureScaler::ScaleBicubicBSpline(int factor, u32* source, u32* dest, int width, int height) { - GlobalThreadPool::Loop(bind(&scaleBicubicBSpline, factor, source, dest, width, height, p::_1, p::_2), 0, height); + GlobalThreadPool::Loop(bind(&scaleBicubicBSpline, factor, source, dest, width, height, placeholder::_1, placeholder::_2), 0, height); } void TextureScaler::ScaleBicubicMitchell(int factor, u32* source, u32* dest, int width, int height) { - GlobalThreadPool::Loop(bind(&scaleBicubicMitchell, factor, source, dest, width, height, p::_1, p::_2), 0, height); + GlobalThreadPool::Loop(bind(&scaleBicubicMitchell, factor, source, dest, width, height, placeholder::_1, placeholder::_2), 0, height); } void TextureScaler::ScaleHybrid(int factor, u32* source, u32* dest, int width, int height, bool bicubic) { @@ -635,8 +626,8 @@ void TextureScaler::ScaleHybrid(int factor, u32* source, u32* dest, int width, i bufTmp1.resize(width*height); bufTmp2.resize(width*height*factor*factor); bufTmp3.resize(width*height*factor*factor); - GlobalThreadPool::Loop(bind(&generateDistanceMask, source, bufTmp1.data(), width, height, p::_1, p::_2), 0, height); - GlobalThreadPool::Loop(bind(&convolve3x3, bufTmp1.data(), bufTmp2.data(), KERNEL_SPLAT, width, height, p::_1, p::_2), 0, height); + GlobalThreadPool::Loop(bind(&generateDistanceMask, source, bufTmp1.data(), width, height, placeholder::_1, placeholder::_2), 0, height); + GlobalThreadPool::Loop(bind(&convolve3x3, bufTmp1.data(), bufTmp2.data(), KERNEL_SPLAT, width, height, placeholder::_1, placeholder::_2), 0, height); ScaleBilinear(factor, bufTmp2.data(), bufTmp3.data(), width, height); // mask C is now in bufTmp3 @@ -649,15 +640,15 @@ void TextureScaler::ScaleHybrid(int factor, u32* source, u32* dest, int width, i // Now we can mix it all together // The factor 8192 was found through practical testing on a variety of textures - GlobalThreadPool::Loop(bind(&mix, dest, bufTmp2.data(), bufTmp3.data(), 8192, width*factor, p::_1, p::_2), 0, height*factor); + GlobalThreadPool::Loop(bind(&mix, dest, bufTmp2.data(), bufTmp3.data(), 8192, width*factor, placeholder::_1, placeholder::_2), 0, height*factor); } void TextureScaler::DePosterize(u32* source, u32* dest, int width, int height) { bufTmp3.resize(width*height); - GlobalThreadPool::Loop(bind(&deposterizeH, source, bufTmp3.data(), width, p::_1, p::_2), 0, height); - GlobalThreadPool::Loop(bind(&deposterizeV, bufTmp3.data(), dest, width, height, p::_1, p::_2), 0, height); - GlobalThreadPool::Loop(bind(&deposterizeH, dest, bufTmp3.data(), width, p::_1, p::_2), 0, height); - GlobalThreadPool::Loop(bind(&deposterizeV, bufTmp3.data(), dest, width, height, p::_1, p::_2), 0, height); + GlobalThreadPool::Loop(bind(&deposterizeH, source, bufTmp3.data(), width, placeholder::_1, placeholder::_2), 0, height); + GlobalThreadPool::Loop(bind(&deposterizeV, bufTmp3.data(), dest, width, height, placeholder::_1, placeholder::_2), 0, height); + GlobalThreadPool::Loop(bind(&deposterizeH, dest, bufTmp3.data(), width, placeholder::_1, placeholder::_2), 0, height); + GlobalThreadPool::Loop(bind(&deposterizeV, bufTmp3.data(), dest, width, height, placeholder::_1, placeholder::_2), 0, height); } void TextureScaler::ConvertTo8888(GLenum format, u32* source, u32* &dest, int width, int height) { @@ -667,15 +658,15 @@ void TextureScaler::ConvertTo8888(GLenum format, u32* source, u32* &dest, int wi break; case GL_UNSIGNED_SHORT_4_4_4_4: - GlobalThreadPool::Loop(bind(&convert4444, (u16*)source, dest, width, p::_1, p::_2), 0, height); + GlobalThreadPool::Loop(bind(&convert4444, (u16*)source, dest, width, placeholder::_1, placeholder::_2), 0, height); break; case GL_UNSIGNED_SHORT_5_6_5: - GlobalThreadPool::Loop(bind(&convert565, (u16*)source, dest, width, p::_1, p::_2), 0, height); + GlobalThreadPool::Loop(bind(&convert565, (u16*)source, dest, width, placeholder::_1, placeholder::_2), 0, height); break; case GL_UNSIGNED_SHORT_5_5_5_1: - GlobalThreadPool::Loop(bind(&convert5551, (u16*)source, dest, width, p::_1, p::_2), 0, height); + GlobalThreadPool::Loop(bind(&convert5551, (u16*)source, dest, width, placeholder::_1, placeholder::_2), 0, height); break; default: diff --git a/GPU/GPUState.h b/GPU/GPUState.h index 017cda1970..18a1afd16b 100644 --- a/GPU/GPUState.h +++ b/GPU/GPUState.h @@ -20,7 +20,6 @@ #include "../Globals.h" #include "../native/gfx/gl_common.h" #include "ge_constants.h" -#include struct GPUgstate { diff --git a/Globals.h b/Globals.h index c4d45fd73f..64e8c11c4b 100644 --- a/Globals.h +++ b/Globals.h @@ -18,6 +18,7 @@ #pragma once #include +#include #include #include #include diff --git a/ffmpeg b/ffmpeg index fe9c6b483d..75911d922f 160000 --- a/ffmpeg +++ b/ffmpeg @@ -1 +1 @@ -Subproject commit fe9c6b483d42c2e481deea97fb6a382c050c10f2 +Subproject commit 75911d922f8324abd9b6209d76c6ff2b4114df06 diff --git a/native b/native index 4267d9903c..58c40dabb1 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 4267d9903c7eb45769c81c48713bc15a4c7039e4 +Subproject commit 58c40dabb103eb38fe5c16ee70722be3185b7afa