Commit Graph
18511 Commits
Author SHA1 Message Date
Henrik Rydgård 9d05abda69 Merge pull request #7950 from unknownbrackets/msvc-2015
Fix StringFromFormat() on MSVC 2015
2015-09-07 20:59:55 +02:00
Unknown W. Brackets d403ef6329 Fix StringFromFormat() on MSVC 2015. 2015-09-07 10:27:36 -07:00
Unknown W. Brackets 936ccbf18a Fix symbolmap loading issue on MSVC 2015. 2015-09-07 09:24:15 -07:00
Unknown W. Brackets 77f0de9b63 Fix a few more line endings.
Otherwise these will appear dirty often.
2015-09-07 09:19:15 -07:00
Unknown W. Brackets ccda83c6ac Merge pull request #7948 from LunaMoo/windows-buildfix
Windows buildfix
2015-09-07 09:16:56 -07:00
LunaMoo 1468432804 Update UnitTests.vcxproj 2015-09-07 10:02:39 +02:00
LunaMoo fc5d4db3cd Update Headless.vcxproj 2015-09-07 10:01:44 +02:00
LunaMoo 9ce3d27b9d Update PPSSPP.vcxproj 2015-09-07 10:00:00 +02:00
LunaMoo c20cf39d5d Update GPU.vcxproj 2015-09-07 09:56:59 +02:00
Henrik Rydgård cf0697ec09 Merge pull request #7946 from unknownbrackets/native-merge
Merge native directly into PPSSPP
2015-09-06 22:37:59 +02:00
Unknown W. Brackets f5c1473f25 Native merge part 3: remove old native. 2015-09-06 13:06:58 -07:00
Unknown W. Brackets 85533dad6e Native merge part 2: update build files.
And a couple minor stragglers.
2015-09-06 13:06:57 -07:00
Unknown W. Brackets dbfc5385c3 Fix line-endings in ui/screen. 2015-09-06 12:29:23 -07:00
Unknown W. Brackets f279c2a3c2 Merge remote repo native into ext/native/. 2015-09-06 12:24:17 -07:00
Unknown W. Brackets e0f85a9c6b Native merge part 1: skip native/ in includes. 2015-09-06 12:19:33 -07:00
Henrik Rydgård 1b4b60d543 Make the Vim autocompletion plugin "YouCompleteMe" happy by adding this config file 2015-09-06 21:16:48 +02:00
Henrik Rydgard bb96478eb1 Another buildfix in native 2015-09-06 20:14:23 +02:00
Henrik Rydgard 08e7fbf8ea Buildfix 2015-09-06 20:14:00 +02:00
Henrik Rydgard a9d04666fb Update ffmpeg submodule as well.. 2015-09-06 19:43:25 +02:00
Henrik Rydgard 966e655798 Update native (hm, why did the hash change?) 2015-09-06 19:42:06 +02:00
Henrik Rydgård b8699f0783 Merge pull request #7933 from hrydgard/vs-2015
Switch to VS 2015
2015-09-06 19:36:18 +02:00
Henrik Rydgård ae9530f3ef Merge pull request #286 from hrydgard/vs-2015
Upgrade project file to VS 2015
2015-09-06 19:36:08 +02:00
Henrik Rydgard ccc4549fec Remove failed attempt at dxerr.lib workaround 2015-09-06 19:32:17 +02:00
Henrik Rydgard f77a2494ad DrawTriangleSlice lambda: Capture parameters by reference, not copy, to avoid alignment issues. 2015-09-06 19:32:16 +02:00
Henrik Rydgard fdea85138c Update project files, fix minor issues for VS 2015 2015-09-06 19:32:15 +02:00
Henrik Rydgard 1c67de0c21 We don't need a third set of sized integer typedefs, get rid of it. 2015-09-06 19:10:08 +02:00
Henrik Rydgard 18ce2262d6 We don't need a third set of typed-integer typedefs 2015-09-06 19:08:32 +02:00
Henrik Rydgård 926c03574c Merge pull request #7945 from hrydgard/move-glstate
Move glstate from native into PPSSPP
2015-09-06 17:33:28 +02:00
Henrik Rydgard 87329ec635 Update native 2015-09-06 17:33:08 +02:00
Henrik Rydgård 9ce1822a83 Merge pull request #288 from hrydgard/move-glstate
Move glstate out to PPSSPP
2015-09-06 16:58:05 +02:00
Henrik Rydgård 7c71855f5d Symbian / Qt buildfixes 2015-09-06 16:03:36 +02:00
Henrik Rydgård d2866194fd Symbian buildfix 2015-09-06 16:03:19 +02:00
Henrik Rydgård 48fbc83abe Android buildfix 2015-09-06 15:26:36 +02:00
Henrik Rydgård b502db61c8 Android buildfix 2015-09-06 15:25:56 +02:00
Henrik Rydgård 8cd69f8a57 Update native 2015-09-06 14:39:34 +02:00
Henrik Rydgård bdd09be76b SDL (Mac) buildfix 2015-09-06 14:38:15 +02:00
Henrik Rydgard ab3468ea02 Move native/gfx_es2/gl_state.cpp/h into GPU/GLES/GLStateCache.cpp/h 2015-09-06 13:45:17 +02:00
Henrik Rydgard 3f02f9fc77 Move gl_state.cpp/h out to PPSSPP 2015-09-06 13:44:06 +02:00
Henrik Rydgard 08735b806f Remove silly use of gstate.SetVSyncInterval 2015-09-06 13:36:33 +02:00
Henrik Rydgard 65e3d31e24 Move the GPU feature detection from gl_state.cpp to gpu_features.cpp 2015-09-06 13:35:42 +02:00
Henrik Rydgard d822cbf60b Move fbo.cpp/h from native into PPSSPP 2015-09-06 13:13:37 +02:00
Henrik Rydgard f78c4f6f84 Move FBO.cpp out into PPSSPP. 2015-09-06 13:12:00 +02:00
Henrik Rydgard 72ae497350 Remove glstate usage except in the GPU implementation. Prepare for moving it into PPSSPP. 2015-09-06 12:42:15 +02:00
Henrik Rydgard 3f05c8d990 Remove usage of glstate. It will be moved into PPSSPP, and only used in PSP rendering. 2015-09-06 12:41:37 +02:00
Henrik Rydgard cfe4c033b9 Update native with FBO bugfixes (caused blackscreen in buffered mode) 2015-09-06 12:41:01 +02:00
Henrik Rydgard e875f0a0c3 Some FBO checks got broken when we stopped lying. 2015-09-06 12:40:40 +02:00
Henrik Rydgard 5ff1d91323 Add file to project that was missing 2015-09-06 12:22:02 +02:00
Henrik Rydgård 1fd6cf1cc5 Merge pull request #7942 from hrydgard/gpu-feature-cleanup
Partial cleanup of GPU feature detection
2015-09-06 10:13:25 +02:00
Henrik Rydgard 43f0ec47db Update native 2015-09-06 10:04:40 +02:00
Henrik Rydgård f4f2a95067 Merge pull request #287 from hrydgard/gpu-feature-cleanup
Partial cleanup of GPU feature detection, native part
2015-09-06 10:03:48 +02:00