1
0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-26 04:32:35 +01:00
Commit Graph

385 Commits

Author SHA1 Message Date
Nekotekina
8bd0ee875c Fixed conflicts 2014-02-26 15:27:06 +04:00
Nekotekina
8048c70bc8 cond/lwcond fixed 2014-02-26 14:35:30 +04:00
Nekotekina
0bd5dc5363 Demuxer improved, cellPamf improved
File reading improved
2014-02-26 11:51:00 +04:00
Alexandro Sánchez Bach
681c3c53f0 cellPad modifications
* Using be_t on cellPad structs.
* Swapped Square and Circle default keys (they were inverted).
2014-02-25 14:09:44 +01:00
Alexandro Sánchez Bach
2827db0e2a Using be_t in some cellGcm structs & minor fixes
* Using be_t in CellGcmControl, CellGcmConfig, CellGcmContextData and
CellGcmTileInfo.
* Fixed wrong names in Emu/SysCalls/Modules/sceNp.cpp
* Fixed ConLog's mount info strings in System.cpp
2014-02-24 17:03:47 +01:00
DHrpcs3
d9d80d8fb4 Merge pull request #83 from Bigpet/master
Make buildable with GCC in Linux
2014-02-24 09:14:21 +02:00
Alexandro Sánchez Bach
7379b0e2ed Minor changes: GCM command, PKG loader & SysCalls
* Fixed incorrect time displayed on NV4097_GET_REPORT.
* Fixed small bug in PKGLoader::UnpackEntry
* Moved some code in SC_Time.cpp
* Auxiliary function declarations of SC_Time.cpp in SC_Time.h
* Updated cellFsUnlink. *This won't work until ExistsFile is fully
implemented*.
2014-02-24 07:54:42 +01:00
Peter Tissen
1908286e7c make things compile under windows again, there's still some ugly ifdefs
I'd like to get rid of
2014-02-24 01:51:55 +01:00
Nekotekina
a14276abf1 Work on demuxer, ffmpeg libs linked 2014-02-24 04:00:42 +04:00
Bigpet
92fb77d50e more merge fixes, I should really compile it before submitting a pull request 2014-02-23 20:40:12 +01:00
Bigpet
aef3b24c8d fix small type mismatch 2014-02-23 18:23:14 +01:00
Bigpet
1be8563fdb fix small merge mistake 2014-02-23 18:21:10 +01:00
Bigpet
bebf027e0b merge newer changes 2014-02-23 18:13:08 +01:00
Bigpet
9a30ce5f18 Make buildable with GCC in Linux
* replace GetThreadID with std::this_thread.getId()
* name all anonymous structs and unions that contain non-trivially constructable objects
* made default constructor for big endian type noexcept to make it work with std::atomic
* move instantiated specialized template function members ouside of the class definition to comply with the standard
* added default instantiation for template parameter "=nullptr"
* used the C++11 standardized thread_local instead of the __declspec(thread)
* added transitional definitions to bridge the microsoft specific calls (compare and exchange and aligned alloc)
* removed cyclic dependency between Emulator->CPUThreadManager->CPUThread->SMutex->Emulator->...
* fixed some instances of indentation by space instead of tabs
* surrounded some unused code with an #if 0 block to make sure it doesn't compile
2014-02-23 17:52:52 +01:00
Alexandro Sánchez Bach
696e00a570 Merge refactoring branch & Krofna's pull req. #46 2014-02-23 02:39:46 +01:00
Nekotekina
8df7f49b55 ffmpeg submodule added 2014-02-22 21:42:23 +04:00
DH
81b19057bb Implemented audio Dump To File
Fixed MFOCRF, MTOCRF, MTCRF
Minor fixes
2014-02-22 14:06:23 +02:00
DHrpcs3
7c6c20ef18 Merge pull request #82 from Nekotekina/master
Event, audio, SPU fixes
2014-02-22 10:54:32 +02:00
DH
05184d2e71 Improved GameViewer
GameViewer use VFS.
Implemented be_t increment / decrement
Implemented se
Improved sys_fs syscalls.
2014-02-22 04:53:06 +02:00
Nekotekina
b56df0c7f6 New functions
sys_spu_thread_bind_queue, sys_spu_thread_connect_event and SPU-side
sys_spu_thread_receive_event, sys_spu_thread_send_event
Fixed event system
Fixed SleepQueue priority alg
Audio: cellAudioGetPortTimestamp and cellAudioGetPortBlockTag
2014-02-22 04:26:50 +04:00
Bigpet
07135570f4 merge branch 2014-02-21 20:36:22 +01:00
Alexandro Sánchez Bach
e7a721a1fb Merge pull request #46 from krofna 2014-02-21 17:13:57 +01:00
Alexandro Sánchez Bach
17b877e448 Minor changes in RSXTexture.h and PKG Loader
* Moved RSXTexture from RSXThread.h to RSXTexture.h
* Renamed RSXTexture::Getmipmap to RSXTexture::GetMipmap
* Used more GCM texture format constants in GLGSRender.h
* PKG Loader: Added an "Overwrite?" dialog in case the folder
dest+titleID (i.e. "/dev_hdd0/game/"+titleID) already exists. Note that
in that case, the game won't be installed regardless of the option you
choose on the dialog.
2014-02-21 14:21:08 +01:00
Alexandro Sánchez Bach
5f9e60c45f PKG Loader rewritten
* Rewritten unpkg.c -> Loader/PKG.cpp
* MainFrame::InstallPkg now *only* installs the PKG.
* Fixed crash when unpacking big debug PKG files.
* Debug PKGs are no longer recrypted.
* 'About...' dialog updated to remove PKG-related notice.
* Unpkg removed.

NOTE: The class PKGLoader is using wxWidgets functions to access the
files. I think VFS would be better, but the Emulator isn't necessarily
running when installing the PKG. In the other hand, initializing VFS
with RPCS3 may be somewhat risky... Any alternatives?

TODO: Get rid of the decrypted "*.dec" files, and try to decrypt and
read contents of the PKG on the fly using the information stored in
m_entries.
2014-02-21 02:35:33 +01:00
Nekotekina
81147506f0 Event fix, cellAudio fix 2014-02-21 00:47:22 +04:00
Nekotekina
08b4748aae cellAdec, cellVpost headers 2014-02-20 16:13:02 +04:00
Nekotekina
9351e50f63 Minor changes, some bugs fixed
cellVdec headers, cellFsAioRead review, sync stuff review, cellAdec and
cellVpost
2014-02-20 06:16:17 +04:00
DH
d6fe398f79 Implemented RSXThread OutOfArgsCount notification. 2014-02-20 01:39:47 +02:00
Alexandro Sánchez Bach
8fedbd204e Merge pull request #81 from elisha464/master
small fix, makes scogger run
2014-02-19 23:50:53 +01:00
elisha464
ab4c4c2fd2 Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-02-20 00:41:32 +02:00
elisha464
45452c57c4 fixed MFOCRF 2014-02-20 00:38:47 +02:00
DH
b1df7444a4 Minor fixes 2014-02-19 19:27:52 +02:00
Alexandro Sánchez Bach
83a7c83761 Moved some lines and deleted old code
* Removed Compiler ELF references from rpcs3.cpp
* Reordered the menu bar lines.
* Moved the construction of some panels of MainFrame from rpcs3.cpp to
MainFrame.cpp
2014-02-19 05:33:31 +01:00
Alexandro Sánchez Bach
b85a86b225 RSX Debugger: Shader program editor
* Added checkbox in the Settings dialog for logging/editing shader
programs.
* Added "Programs" tab to the RSX Debugger. Double-click on the entries
to view/edit the shaders. Click on "Yes" after closing the editor will
recompile your program even if no changes were done.
* Replaced "Ctrl+C" shortcut for running the emulator with "Ctrl+E" to
avoid accidentally unpausing the emulator when copying text.
* Added glDetachShader to GLProcTable.tbl

NOTE: There is a known bug: For some reason, certain shaders refuse to
compile again, even if you save the original shader as the "new" one.
2014-02-19 01:41:57 +01:00
Alexandro Sánchez Bach
51613df455 Merge pull request #80 from Nekotekina/master
Sync changes, simple file output for sound
2014-02-18 20:57:32 +01:00
Nekotekina
d849e083b6 Small changes 2014-02-18 22:45:51 +04:00
Alexandro Sánchez Bach
22558df68e Merge pull request #79 from elisha464/master
vertexShaderDecompiler fix
2014-02-17 22:10:08 +01:00
elisha464
7f7b12a6dd a small fix in vertexShaderDecompiler (fixes scogger loading screen) 2014-02-17 23:05:59 +02:00
elisha464
07c9fbee7f Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
Conflicts:
	rpcs3/Emu/GS/GL/GLGSRender.cpp
	rpcs3/Emu/GS/GL/GLGSRender.h
	rpcs3/Emu/GS/RSXTexture.cpp
	rpcs3/Emu/GS/RSXThread.cpp
	rpcs3/Emu/GS/RSXThread.h
	rpcs3/Gui/RSXDebugger.cpp
	rpcs3/rpcs3.vcxproj.filters
2014-02-17 19:27:17 +02:00
Alexandro Sánchez Bach
ab25edfacc Few source-code improvements
* Fixed identation inconsistency after last merge.
* Replaced uint32_t with u32 in LinearToSwizzleAddress.
* Replaced hardcoded values with defined GCM constants (in Emu/GS/GCM.h)
in some switch statements.

This commit won't produce any changes in the RPCS3 executable. It's just
to make the code easier to read.
2014-02-16 22:17:56 +01:00
Nekotekina
931929a82c Fixed conflicts 2014-02-16 21:57:36 +04:00
DH
bd8ff4ca11 Fixed cellFsOpen & cellFsOpendir 2014-02-16 17:37:32 +02:00
Nekotekina
4375b9dd2a Audio port output in .wav file 2014-02-16 19:23:58 +04:00
DH
321d323beb Improved VFS
- Implemended vfsDir.
- Improved vfsDevice.
- Improved vfsFile.
2014-02-16 17:19:06 +02:00
DH
5d59dae730 Fixed RSXDebugger 2014-02-16 11:39:03 +02:00
DH
a7368cc893 Merged elisha464 branch 2014-02-16 10:56:58 +02:00
DH
01f3763eb4 Small fixes 2014-02-16 10:28:32 +02:00
Alexandro Sánchez Bach
3fdb50b0ea Some sceNpTrophy syscalls and few fixes
* Restored deleted functions in FuncList.cpp
* Fixed bugs in TRPLoader.
* Implemented some sceNpTrophy syscalls.
* Added sceNp headers (required for sceNpTrophy).
* Updated .gitignore to ignore trophies.

NOTE: Thanks to the new sceNpTrophy syscalls, RPCS3 can install the
trophy contents in dev_hdd0/home/00000001/trophy/. Remember this is
still on an experimental stage.
2014-02-16 02:51:04 +01:00
Nekotekina
848c5dadf0 Fixed some problems 2014-02-16 01:16:35 +04:00
elisha464
5590efe054 Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
Conflicts:
	rpcs3/Emu/GS/GL/GLVertexProgram.cpp
	rpcs3/rpcs3.vcxproj.filters
2014-02-15 13:05:16 +02:00