Commit Graph

1036 Commits

Author SHA1 Message Date
Sacha
4ab88cad12 Qt code refactor. Stage 1 in a code refactor. Removed NativeApp.cpp redundancy (since the Qt code reimplemented almost all of it). Changed to Qt types where logical. Cleaned up globals. Start of work at integrating more of the Qt code in to native/ (where GUI should be). 2013-01-16 02:20:21 +10:00
Henrik Rydgard
72333821bf Disable ArmEmitterTest on startup, it seems to cause problems? 2013-01-14 23:55:53 +01:00
Henrik Rydgard
66ee2e2933 Remove ArmABI.cpp/h, didn't need that stuff. 2013-01-14 22:19:18 +01:00
Henrik Rydgard
8ce9ce10bf Merge branch 'master' into armjit
Conflicts:
	Common/ArmEmitter.h
	Common/CPUDetect.cpp
2013-01-14 20:46:17 +01:00
Henrik Rydgard
7d1ddced9f Only unbind FBOs if they're being used. 2013-01-14 20:44:11 +01:00
Sacha
4c827f6d68 Enable saving when pressing 'Exit'. TODO: Should save when settings change instead. 2013-01-15 01:01:19 +10:00
Xele02
fd301a000a Implement Qt window like Windows version. 2013-01-14 00:29:42 +01:00
Henrik Rydgard
7484ddfbbc Merge branch 'master' into armjit
Conflicts:
	Common/ArmEmitter.h
2013-01-13 12:14:32 +01:00
Henrik Rydgard
590d94da9f Add basic stencil test functionality, shadows work in Wipeout. update native.
This is not the whole story though, the PSP is being tricky by sharing the dest alpha and stencil.
2013-01-12 17:21:07 +01:00
Henrik Rydgard
38f437010c Merge branch 'master' into armjit 2013-01-12 00:44:06 +01:00
Henrik Rydgard
88cdbb9cc6 Viewport fix 2013-01-12 00:00:18 +01:00
Henrik Rydgard
b4af05a23c Call init on drawbuffer. upgrade native. 2013-01-11 23:48:07 +01:00
Henrik Rydgard
551bf7b0ad Let's build for both armeabi and armeabi-v7a again. 2013-01-11 19:40:33 +01:00
Henrik Rydgard
2e6063d084 Merge branch 'master' into armjit 2013-01-11 18:01:32 +01:00
Henrik Rydgard
bc9c3db303 Armjit: Add option for fastmem. Small optimization. 2013-01-11 17:25:54 +01:00
Sacha
e998621b1f Only show native dialog for Symbian. Show Qt in credits to everything USING_QT_UI. 2013-01-12 00:37:22 +10:00
Sacha
7a38f459ad Experimental Qt file dialog support 2013-01-11 23:47:54 +10:00
Henrik Rydgard
7390f2b5f6 Some realtime profiling stuff. Enable FZ (flush-to-zero) mode. 2013-01-11 00:13:39 +01:00
Henrik Rydgard
2835a42289 Merge branch 'master' into armjit 2013-01-10 23:52:11 +01:00
Henrik Rydgard
ca0d74762d Some realtime profiling stuff. Enable FZ (flush-to-zero) mode. 2013-01-10 23:49:33 +01:00
Henrik Rydgard
c7a137a930 Merge branch 'master' into armjit
Conflicts:
	android/jni/MenuScreens.cpp
2013-01-10 12:57:45 +01:00
Henrik Rydgard
479d1f5111 Draw using VBO. Add option, make default true. 2013-01-10 12:54:36 +01:00
Henrik Rydgard
9dcdb6df90 Jit work! Shifts, 3-operand ops, turn O2 back on... 2013-01-10 01:20:25 +01:00
Henrik Rydgard
f5c94775b9 Cleanup 2013-01-09 00:12:02 +01:00
Henrik Rydgard
8915677241 More progress but it weirds out... 2013-01-08 21:24:42 +01:00
Henrik Rydgard
8c06edc47b It's getting close to the first totally unoptimized jit run. 2013-01-08 17:03:17 +01:00
Henrik Rydgard
b3fd1ff34c Lots of various work on the ARM jit. It executes a couple of blocks now. 2013-01-08 13:49:52 +01:00
Henrik Rydgard
5a7f4acc06 More armjit work 2013-01-08 00:26:42 +01:00
Henrik Rydgard
a2ff416534 Rename files. Rewrite ArmRegCache from scratch. 2013-01-07 22:33:09 +01:00
Henrik Rydgard
fcf4cfa767 Rename ThunkARM.cpp->ArmThunk.cpp 2013-01-07 13:11:33 +01:00
Henrik Rydgard
7cb95bbc89 Merge branch 'master' into armjit
Conflicts:
	CMakeLists.txt
	Core/MIPS/ARM/RegCache.cpp
2013-01-07 10:25:02 +01:00
Henrik Rydgard
38ae09b50f Merge remote-tracking branch 'origin/armjit' into armjit
Conflicts:
	android/jni/MenuScreens.cpp
2013-01-07 10:22:50 +01:00
Unknown W. Brackets
cf1295e95f Enable fake mpeg mode by default.
Note: loaded save states will have it off.  No UI yet.
2013-01-06 19:55:04 -08:00
Henrik Rydgard
9363a867e2 Add glViewport to cached gl state. Add a couple of missing VFPU ops. 2013-01-06 23:23:36 +01:00
Henrik Rydgard
5ba5ceff19 Merge branch 'master' into mediaengine 2013-01-05 16:22:08 +01:00
Henrik Rydgard
5066df5881 0.5 2013-01-04 14:33:24 +01:00
Henrik Rydgard
a9c171c786 Fix bAutoRun config option, add to menu. (Run on Load). 2013-01-04 10:26:14 +01:00
Henrik Rydgard
e3ee83c6a6 Add option for 2x buffered rendering on Android. 2013-01-03 12:04:00 +01:00
Henrik Rydgard
19b8ff5331 Use snappy to compress savestates. This is a bit of a hackjob sorry, will clean after 0.5. 2013-01-02 22:13:29 +01:00
TMaul
399b8fb15d And remove scesuppreacc from the makefiles as well 2013-01-02 20:30:02 +00:00
Henrik Rydgard
883f61e3dd Savestates: Add quicksave/quickload. Add Android UI for savestates. All single slot for now. 2013-01-02 21:05:02 +01:00
Henrik Rydgard
41ea4ff358 Move memstick data on Android to external memory (sdcard/usb storage) 2013-01-02 21:05:00 +01:00
Unknown W. Brackets
6d65be5626 Fix android build. 2012-12-29 03:34:11 -08:00
Unknown W. Brackets
6f9f9e1c98 Merge branch 'master' into mediaengine.
Note: doesn't compile, just fixes conflicts.

Conflicts:
	Core/HLE/sceKernel.cpp
	Core/HLE/sceKernelThread.cpp
	Core/HLE/sceKernelThread.h
2012-12-28 22:32:56 -08:00
Unknown W. Brackets
abeaaa9105 Add Verify() method to quickly test states work. 2012-12-28 13:55:22 -08:00
artart78
d251bcfc96 Fix buttons for the virtual gamepad 2012-12-28 13:49:36 +01:00
Henrik Rydgård
57b4d658cc Don't log display lists, instead dump them on demand.
Makes it fairly convenient to dump and look at display lists at run time
on non windows platforms. Adding a menu item on Windows should be
trivial.
2012-12-27 23:38:55 +01:00
Henrik Rydgård
3f5eae3db5 Add some options to ingame menu. Minor fixes. 2012-12-27 23:38:55 +01:00
Henrik Rydgård
9fe6dcb863 Non-windows button mapping tweaks 2012-12-26 08:51:03 +01:00
Henrik Rydgård
d95dbca9be Cleanup GPU init/shutdown a bit 2012-12-25 22:42:19 +01:00
Henrik Rydgård
d56bc40db4 NativeApp: Load config before processing flags (duh) 2012-12-25 09:02:02 +01:00
Sacha
f7878c8351 Get Symbian running again 2012-12-24 03:19:52 +10:00
Unknown W. Brackets
7aa7640e87 Add -f switch for parody with Headless. 2012-12-22 09:49:59 -08:00
Henrik Rydgard
ea07c14c4c Add IndexGenerator.cpp/h which will later be used to combine small draw calls into large indexed draw calls, for better performance. 2012-12-21 22:53:24 +01:00
Henrik Rydgard
f5efd6f2b1 JIT: add option to enable/disable jit of memory instructions. for crash safety. 2012-12-21 16:50:13 +01:00
Henrik Rydgard
4efb66fdb6 Fix hw transform and audio on android, misc 2012-12-21 12:57:43 +01:00
Henrik Rydgard
4bf2e52623 HW transform: Avoid 4x3 matrices for GLES 2.0 compat. Add option to turn hw transform on. 2012-12-21 11:08:54 +01:00
Henrik Rydgard
ab35c7f612 Merge branch 'master' into mediaengine 2012-12-18 00:05:09 +01:00
Henrik Rydgard
a60d487d8d Create files for sceUsb 2012-12-17 21:45:32 +01:00
Henrik Rydgard
bc214dcf37 Merge branch 'master' into mediaengine
Conflicts:
	Common/LogManager.cpp
	Core/CMakeLists.txt
	Core/Core.vcxproj
	Core/Core.vcxproj.filters
	Core/CoreParameter.h
	Core/HLE/sceAudio.cpp
	Core/HLE/sceKernel.cpp
	Core/HLE/sceKernelThread.cpp
	Core/HLE/sceMpeg.cpp
	android/jni/Android.mk
2012-12-17 18:48:32 +01:00
Henrik Rydgard
213320607c Upgrade pspautotests, misc 2012-12-17 18:07:25 +01:00
Henrik Rydgård
5d11bc7c3c Merge pull request #187 from xsacha/master
Unified assets/ dir + Qt project files + Readme
2012-12-17 03:21:39 -08:00
Henrik Rydgard
15b7c1c96c sceSas cleanup 2012-12-16 20:40:49 +01:00
Sacha
14f201793b Unified assets/ dir for icons/images 2012-12-17 01:47:39 +10:00
Xele02
a5431f127a Merge remote-tracking branch 'upstream/master' 2012-12-16 03:41:13 +01:00
Unknown W. Brackets
bf0792e42a Buildfix for Android too. 2012-12-15 15:43:59 -08:00
Xele02
fc3ff5853c Update for android build 2012-12-13 22:45:13 +01:00
Sacha
a1781b854a Symbian support for project.
New UNUSABLE_MMAP code path for platforms that cannot use the required flags (Xbox 360, Symbian). Falls back to malloc() instead.
N1 define for compilers (GCCE) that don't like to assume (int)-1 will safely cast to (char)-1.
Miscellaneous space->tab fixes.
2012-12-13 13:15:20 +10:00
Sacha
62908325a0 Make the armjit branch compile on Blackberry, compatible with iOS. Still crashes on ArmEmitterTest(). 2012-12-13 11:41:30 +10:00
Xele02
f633e2d9b5 Merge branch 'work' 2012-12-10 13:12:26 +01:00
Xele02
7de10d223b * Create class for Save and Message dialog for cleaner code.
* Update Save dialog to work more like the real one on PSP
* Correct some return value for Save Dialog.
2012-12-10 13:08:54 +01:00
TMaul
b7b40ba6d6 Make the flash filesystem a real directory
Not really needed yet, but it will be.
2012-12-09 23:32:44 +00:00
Xele02
63b0b61232 Change filesystem for mounted memory card
Clean some code and comment
2012-12-09 16:59:07 +01:00
Henrik Rydgård
e724d82c46 Merge remote-tracking branch 'origin' into armjit
Conflicts:
	CMakeLists.txt
2012-12-09 09:54:58 +07:00
Henrik Rydgård
ef387dbd51 More buildfixing... 2012-12-07 01:46:17 +07:00
Henrik Rydgård
0bc1d4cdf3 SDL port: Turn the JIT on and off from command line 2012-12-06 20:43:01 +07:00
Henrik Rydgård
36943db4ec Merge branch 'master' of github.com:hrydgard/ppsspp
Conflicts:
	Core/Config.h
2012-12-05 10:57:30 +07:00
Henrik Rydgård
700921deb3 Fix rendering on MacOSX (shader compiler very fussy...). Minor prep for hw transform. 2012-12-05 10:55:06 +07:00
MaXiMu
83cb8cef6c Add armeabi on android 2012-12-02 22:48:31 +01:00
Sacha
5316f856d1 Blackberry 10 Port
* Replace SDL with asound backend (removes the only dependency)
* Remove all references to SDL in bar-descriptor.xml, blackberry_build.sh
* Greatly simplify blackberry_build.sh
* Modify CMakeLists.txt to account for removal of SDL
* Remove redundancy in CMakeLists.txt (EGLv2)
* Refactor nativeExtra's and setting targets
* Remove android/CMakeLists.txt (unrelated file)
* Update for latest Blackberry NDK (1088)
* Handle bug with VSync in latest NDK
* Update bar-descriptor.xml to version 0.4
* Fix define on iOS in FragmentShaderGenerator.cpp
* Specify NDK used in Credits by target platform, add contributor, remove redundancy
2012-12-02 14:48:00 +10:00
Henrik Rydgård
67f9f3f73f SDL port: Add DEBUG option to set _DEBUG, add ability to log gfx stuff 2012-12-01 23:38:18 +01:00
Henrik Rydgård
364a78edaf Add option to show/hide touch controls 2012-12-01 23:20:08 +01:00
Henrik Rydgard
815c3240bc V4 2012-12-01 10:44:37 +01:00
Henrik Rydgard
3de1259eb8 Upgrade native 2012-12-01 10:39:20 +01:00
Henrik Rydgard
a5e35ad6d9 Parse PARAM.SFO to get the disc ID, show in title bar on Windows 2012-11-30 22:32:51 +01:00
Henrik Rydgard
00c218860e Add -DARM and -DUSING_GLES to standalone Android makefiles. 2012-11-26 09:06:22 +01:00
Sacha
3c903dda24 Improve portability to future platforms. Make use of new USING_GLES2 define throughout PPSSPP. Also use ARM definition where suitable. Remove some redundancy with includes. 2012-11-26 13:25:14 +10:00
Henrik Rydgard
4b67f22072 Fixes to usage of gl state stuff 2012-11-25 17:21:23 +01:00
Henrik Rydgård
6f8f5cb391 Fix gl ui issues 2012-11-25 12:39:15 +01:00
Henrik Rydgard
863bc863c9 Some more arm work 2012-11-24 17:51:10 +01:00
Florent Castelli
56175bc505 Defer blend, cull and depth test changes to draw command
Avoid unnecessary state changes and reduces the amount of OpenGL calls.
It also puts all the interesting logic at the same place, reducing the
complexity a little.
2012-11-24 15:19:29 +01:00
Henrik Rydgard
265e70a498 Just some sketchwork on a JIT for ARM. When completed, will bring speed to mobile devices. 2012-11-23 19:41:35 +01:00
Henrik Rydgard
a97f66766d Add "slightly faster interpreter", optimizing the most common instrs. Not as helpful as I thought it would be on Android, really need a proper JIT. 2012-11-23 12:42:35 +01:00
Henrik Rydgard
08f8f4b323 Cleanup sceRtc, move sceFont to its own file. 2012-11-22 22:30:44 +01:00
Diogo Franco (Kovensky)
2936c334b5 Add android.toolchain.cmake from http://code.google.com/p/android-cmake
ANDROID_DEFAULT_NDK_API_LEVEL was changed to 9, otherwise the file
is unchanged.
2012-11-21 14:35:18 -03:00
Diogo Franco (Kovensky)
cd93e49584 Move toplevel windows-specific files to the Windows dir 2012-11-21 14:33:38 -03:00
Henrik Rydgard
45369af482 0.31 in the UI 2012-11-20 22:41:24 +01:00
Henrik Rydgård
2a56d36b12 glViewport calls need to be in pixel coordinates. 2012-11-20 16:48:24 +01:00
Henrik Rydgard
4c2929cf13 v0.3 2012-11-20 11:54:51 +01:00
Henrik Rydgard
4b87da74cb windows gui option for buffered rendering. Misc fixes, prettier checkbox on android. 2012-11-20 11:35:48 +01:00
Henrik Rydgard
f378f959e1 Fix issues with games that don't call sceDisplaySet mode. Add option to run without FBOs, may be useful on slow devices. 2012-11-20 10:59:23 +01:00
Henrik Rydgard
8a6d151df5 ALPHA_TEST doesn't exist on OpenGL ES 2.0 2012-11-20 00:35:14 +01:00
Henrik Rydgard
8b67975a47 GL: Framebuffer management using FBOs. Fixes flicker in Lumines and many others. 2012-11-19 23:29:14 +01:00
Henrik Rydgard
91e1cce17e Some reorg in preparation for FBO work 2012-11-19 21:23:29 +01:00
Henrik Rydgård
14a59fdc75 Found a better way to do the previous change. Allow JIT on mac/linux. 2012-11-19 14:51:47 +01:00
Henrik Rydgård
fb25b7405c Synchronize the mainloop to the display end-of-frame on nonWindows
platforms.
2012-11-19 14:16:37 +01:00
Florent Castelli
a9ab88d3ae Fix Ant clean command 2012-11-19 02:11:57 +01:00
Florent Castelli
e221dfdc5c Build JNI for Android in Ant file 2012-11-19 01:11:46 +01:00
Henrik Rydgard
920c866f50 Add ant build file, change target to android-10 2012-11-18 23:58:49 +01:00
Henrik Rydgard
8e3148587a Merge branch 'master' of github.com:hrydgard/ppsspp 2012-11-18 23:40:35 +01:00
Henrik Rydgard
d572d40c36 More warning fixing 2012-11-18 23:35:02 +01:00
Florent Castelli
1f9f50a557 Fix Android build on Linux 2012-11-18 23:22:45 +01:00
Henrik Rydgard
e37a1fb1d3 Add internal 2D drawing library that goes through the Ge emulation for portability.
To be used for things like sceUtility* and other overlays like FPS and stats.
2012-11-18 13:04:49 +01:00
Henrik Rydgard
e5c6cf965b Fixes and optimizations to vertex decoding and lighting.
Motorcycles are now visible in MotoGP.
2012-11-16 15:16:14 +01:00
Sacha
8c9f9ae1cf Clean up SDL/CMakeLists, clean up Blackberry build process, further reduce memory allocation (needed for Dev Alpha) 2012-11-14 02:20:01 +10:00
Henrik Rydgard
1127c72124 some initial mediaengine work 2012-11-12 20:53:16 +01:00
Henrik Rydgard
0fb8c08af3 Test fixes and cleanups 2012-11-11 22:38:19 +01:00
Henrik Rydgard
6c160ee7fc 0.2 2012-11-10 16:39:42 +01:00
Henrik Rydgard
9271bc2383 New icon 2012-11-10 16:36:54 +01:00
Henrik Rydgard
387552f564 Misc fixes (accept .prx, work on power callbacks, bugs) 2012-11-10 10:15:11 +01:00
Henrik Rydgard
d671afdef4 sceImpose 2012-11-09 12:31:58 +01:00
Henrik Rydgard
259b169bbc Implement a few more little things 2012-11-08 16:28:45 +01:00
Sacha
27ea6823c7 Blackberry 10 fully supported with working video, input and sound on Playbook, Dev Alpha and beyond.
Video: http://www.youtube.com/watch?v=CdUL1DalYrw
2012-11-08 03:22:10 +10:00
Henrik Rydgard
1ae7528de1 android buildfix 2012-11-06 17:23:33 +01:00
Henrik Rydgard
85d5cfd8c4 Add more proper "Null" GPU 2012-11-06 17:05:27 +01:00
Henrik Rydgard
d086c18db7 MemoryStick HW 2012-11-06 15:45:13 +01:00
Henrik Rydgard
ac910d7e75 Fix Windows and Android builds. 2012-11-05 15:42:21 +01:00
Henrik Rydgard
687b085357 Missed these somehow 2012-11-04 23:58:25 +01:00
Henrik Rydgard
64cc573703 Switch to "GPL 2.0 or later" for various reasons. I wrote most of the code I imported from Dolphin (which is GPL2-but-not-later), so it should be OK. 2012-11-04 23:24:00 +01:00
Henrik Rydgard
0c66247c0d Merge branch 'master' of github.com:hrydgard/ppsspp 2012-11-04 19:57:37 +01:00
Henrik Rydgård
baebaaddf9 Respect the IgnoreBadMemAccess ini option (exit on bad access if set).
Fix ini save/load on SDL build.
2012-11-04 11:54:45 +01:00
Henrik Rydgård
63beeb5030 Add command line flag to set log level to debug. Cleanup. 2012-11-04 11:31:06 +01:00
Henrik Rydgård
581872f2d0 If filename specified on command line, jump directly to it. Retab NativeApp.cpp. 2012-11-04 10:56:22 +01:00
Henrik Rydgard
d51ce915ca Fix the link to Dolphin in the credits. 2012-11-02 17:52:51 +01:00
Henrik Rydgard
5878f28fca Merge Ryan's latest ARM emitter work from Dolphin 2012-11-02 11:58:56 +01:00
Henrik Rydgard
4f7ad15758 Add snapshot of the whole source code. 2012-11-01 16:19:01 +01:00