Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Buildfixes.

Browse Source 
Fix C++11 usage.
Remove redundancy.
Fix st_*time re-usage.
This commit is contained in:
Sacha 2013-06-02 13:26:39 +10:00
parent aa2781a130
commit b39a572043
23 changed files with 22 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Common/FileSearch.cpp
View File

@ -28,7 +28,6 @@
#ifdef __APPLE__
#include <strings.h>
#endif
#include <string>
#include "FileSearch.h"

3
Common/KeyMap.cpp
View File

@ -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 <map>
#include <string>
#include "input/input_state.h"
#include "Core/Config.h"
#include "KeyMap.h"

1
Common/MemArena.cpp
View File

@ -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"

2
Core/CoreTiming.h
View File

@ -33,8 +33,6 @@
#include "../Globals.h"
#include <string>
class PointerWrap;
//const int CPU_HZ = 222000000;

2
Core/Debugger/SymbolMap.cpp
View File

@ -22,14 +22,12 @@
#include <unistd.h>
#endif
#include <cstring>
#include <algorithm>
#include "../../Globals.h"
#include "../../Core/MemMap.h"
#include "SymbolMap.h"
#include <vector>
#include <map>
SymbolMap symbolMap;

3
Core/Dialog/SavedataParam.h
View File

@ -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
{

1
Core/ELF/ParamSFO.cpp
View File

@ -17,7 +17,6 @@
#include <stdio.h>
#include <string.h>
#include "../Globals.h"
#include "ParamSFO.h"
struct Header

2
Core/ELF/ParamSFO.h
View File

@ -18,10 +18,10 @@
#pragma once
#include <string>
#include <map>
#include "Common/CommonTypes.h"
#include "../Globals.h"
class ParamSFOData
{

2
Core/ELF/PrxDecrypter.cpp
View File

@ -1,5 +1,3 @@
#include <cstring>
extern "C"
{
#include "ext/libkirk/kirk_engine.h"

2
Core/FileSystems/BlockDevices.h
View File

@ -23,8 +23,6 @@
// The ISOFileSystemReader reads from a BlockDevice, so it automatically works
// with CISO images.
#include <string>
#include "../../Globals.h"
#include "Core/ELF/PBPReader.h"

1
Core/FileSystems/DirectoryFileSystem.h
View File

@ -20,7 +20,6 @@
// TODO: Remove the Windows-specific code, FILE is fine there too.
#include <map>
#include <string>
#include "../Core/FileSystems/FileSystem.h"

1
Core/FileSystems/FileSystem.h
View File

@ -19,7 +19,6 @@
#include "../../Globals.h"
#include "ChunkFile.h"
#include <string>
enum FileAccess
{

2
Core/FileSystems/ISOFileSystem.h
View File

@ -18,9 +18,7 @@
#pragma once
#include <map>
#include <string>
#include <list>
#include <vector>
#include "FileSystem.h"

1
Core/HLE/sceKernel.h
View File

@ -19,7 +19,6 @@
#include "../../Globals.h"
#include "Common.h"
#include <cstring>
#include <map>
class PointerWrap;

1
Core/HLE/sceKernelModule.cpp
View File

@ -17,7 +17,6 @@
#include <fstream>
#include <algorithm>
#include <string>
#include "Core/HLE/HLE.h"
#include "Core/HLE/HLETables.h"

1
Core/HW/OMAConvert.cpp
View File

@ -1,5 +1,4 @@
#include "OMAConvert.h"
#include <cstring>
namespace OMAConvert {

2
Core/Host.h
View File

@ -17,8 +17,6 @@
#pragma once
#include <cstring>
#include <string>
#include "../Globals.h"
struct InputState;

2
Core/Util/BlockAllocator.h
View File

@ -19,9 +19,7 @@
#include "../../Globals.h"
#include <vector>
#include <list>
#include <cstring>
class PointerWrap;

39
GPU/GLES/TextureScaler.cpp
View File

@ -28,15 +28,6 @@
#include <stdlib.h>
#include <math.h>
#ifdef __SYMBIAN32__
#define p
#elif defined(IOS)
#include <tr1/functional>
namespace p = std::tr1::placeholders;
#else
namespace p = std::placeholders;
#endif
#if _M_SSE >= 0x402
#include <nmmintrin.h>
#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:

1
GPU/GPUState.h
View File

@ -20,7 +20,6 @@
#include "../Globals.h"
#include "../native/gfx/gl_common.h"
#include "ge_constants.h"
#include <cstring>
struct GPUgstate
{

1
Globals.h
View File

@ -18,6 +18,7 @@
#pragma once
#include <cstdio>
#include <cstring>
#include <vector>
#include <string>
#include <utility>

2
ffmpeg

@ -1 +1 @@
Subproject commit fe9c6b483d42c2e481deea97fb6a382c050c10f2
Subproject commit 75911d922f8324abd9b6209d76c6ff2b4114df06

2
native

@ -1 +1 @@
Subproject commit 4267d9903c7eb45769c81c48713bc15a4c7039e4
Subproject commit 58c40dabb103eb38fe5c16ee70722be3185b7afa