Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-16 04:09:51 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Make compilable under VS2015

Browse Source
This commit is contained in:
Peter Tissen 2015-03-06 00:24:39 -08:00
parent d4d0d334cb
commit f5795a68a7
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/HLE/sceRtc.cpp
View File

@ -459,12 +459,12 @@ static int sceRtcConvertLocalTimeToUTC(u32 tickLocalPtr,u32 tickUTCPtr)
{
u64 srcTick = Memory::Read_U64(tickLocalPtr);
// TODO : Let the user select his timezone / daylight saving instead of taking system param ?
#if defined(__GLIBC__) || defined(BLACKBERRY) || defined(__SYMBIAN32__)
#if !defined(_MSC_VER)
time_t timezone = 0;
tm *time = localtime(&timezone);
srcTick -= time->tm_gmtoff*1000000ULL;
#else
srcTick -= -timezone * 1000000ULL;
srcTick -= -_timezone * 1000000ULL;
#endif
Memory::Write_U64(srcTick, tickUTCPtr);
}
@ -482,12 +482,12 @@ static int sceRtcConvertUtcToLocalTime(u32 tickUTCPtr,u32 tickLocalPtr)
{
u64 srcTick = Memory::Read_U64(tickUTCPtr);
// TODO : Let the user select his timezone / daylight saving instead of taking system param ?
#if defined(__GLIBC__) || defined(BLACKBERRY) || defined(__SYMBIAN32__)
#if !defined(_MSC_VER)
time_t timezone = 0;
tm *time = localtime(&timezone);
srcTick += time->tm_gmtoff*1000000ULL;
#else
srcTick += -timezone * 1000000ULL;
srcTick += -_timezone * 1000000ULL;
#endif
Memory::Write_U64(srcTick, tickLocalPtr);
}
@ -1015,12 +1015,12 @@ static int sceRtcFormatRFC2822LocalTime(u32 outPtr, u32 srcTickPtr)
}
int tz_seconds;
#if defined(__GLIBC__) || defined(BLACKBERRY) || defined(__SYMBIAN32__)
#if !defined(_MSC_VER)
time_t timezone = 0;
tm *time = localtime(&timezone);
tz_seconds = time->tm_gmtoff;
#else
tz_seconds = -timezone;
tz_seconds = -_timezone;
#endif
DEBUG_LOG(SCERTC, "sceRtcFormatRFC2822LocalTime(%08x, %08x)", outPtr, srcTickPtr);
@ -1050,12 +1050,12 @@ static int sceRtcFormatRFC3339LocalTime(u32 outPtr, u32 srcTickPtr)
}
int tz_seconds;
#if defined(__GLIBC__) || defined(BLACKBERRY) || defined(__SYMBIAN32__)
#if !defined(_MSC_VER)
time_t timezone = 0;
tm *time = localtime(&timezone);
tz_seconds = time->tm_gmtoff;
#else
tz_seconds = -timezone;
tz_seconds = -_timezone;
#endif
DEBUG_LOG(SCERTC, "sceRtcFormatRFC3339LocalTime(%08x, %08x)", outPtr, srcTickPtr);

14
GPU/Software/Rasterizer.cpp
View File

@ -1309,14 +1309,24 @@ void DrawTriangle(const VertexData& v0, const VertexData& v1, const VertexData&
int range = (maxY - minY) / 16 + 1;
if (gstate.isModeClear()) {
if (range >= 24 && (maxX - minX) >= 24 * 16)
GlobalThreadPool::Loop(std::bind(&DrawTriangleSlice<true>, v0, v1, v2, minX, minY, maxX, maxY, placeholder::_1, placeholder::_2), 0, range);
{
auto bound = [&](int a, int b) -> void {DrawTriangleSlice<true>(v0, v1, v2, minX, minY, maxX, maxY, a, b); };
GlobalThreadPool::Loop(bound, 0, range);
}
else
{
DrawTriangleSlice<true>(v0, v1, v2, minX, minY, maxX, maxY, 0, range);
}
} else {
if (range >= 24 && (maxX - minX) >= 24 * 16)
GlobalThreadPool::Loop(std::bind(&DrawTriangleSlice<false>, v0, v1, v2, minX, minY, maxX, maxY, placeholder::_1, placeholder::_2), 0, range);
{
auto bound = [&](int a, int b) -> void {DrawTriangleSlice<false>(v0, v1, v2, minX, minY, maxX, maxY, a, b); };
GlobalThreadPool::Loop(bound, 0, range);
}
else
{
DrawTriangleSlice<false>(v0, v1, v2, minX, minY, maxX, maxY, 0, range);
}
}
}