Skip to content

Commit

Permalink
merge rpcsx-gpu and rpcsx-os
Browse files Browse the repository at this point in the history
initial watchdog implementation
implement gpu -> os events
implement main gfx queue
  • Loading branch information
DHrpcs3 committed Oct 12, 2024
1 parent 8e9711e commit 0c16e29
Show file tree
Hide file tree
Showing 236 changed files with 4,651 additions and 4,671 deletions.
19 changes: 1 addition & 18 deletions .github/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,8 @@ git clone https://github.com/KhronosGroup/SPIRV-Cross && cd SPIRV-Cross && mkdir
```
git clone --recursive https://github.com/RPCSX/rpcsx && cd rpcsx
```
```
git submodule update --init --recursive
```
## How to compile the emulator

```
mkdir -p build && cd build && cmake .. && cmake --build .
```

## How to create a Virtual HDD

> The PS4 has a case-insensitive filesystem. To create the Virtual HDD, do the following:
```
truncate -s 512M ps4-hdd.exfat
mkfs.exfat -n PS4-HDD ./ps4-hdd.exfat
mkdir ps4-fs
sudo mount -t exfat -o uid=`id -u`,gid=`id -g` ./ps4-hdd.exfat ./ps4-fs
cmake -B build && cmake --build build -j$(nproc)
```
6 changes: 3 additions & 3 deletions .github/USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@

You will need firmware 5.05 dumped via PS4 FTP it must be fully decrypted and we do not provide the firmware

See the Commands of `rpcsx-os` (`-h` argument), or join the [Discord](https://discord.gg/t6dzA4wUdG) for help.
See the Commands of `rpcsx` (`-h` argument), or join the [Discord](https://discord.gg/t6dzA4wUdG) for help.

You can run the emulator with some samples using this command:

```sh
rm -f /dev/shm/rpcsx-* && ./rpcsx-os --mount "<path to fw>/system" "/system" --mount "<path to 'game' root>" /app0 /app0/some-test-sample.elf [<args for test elf>...]
./rpcsx --mount "<path to fw>/system" "/system" --mount "<path to 'game' root>" /app0 /app0/some-test-sample.elf [<args for test elf>...]
```
### You can now enter safe mode

```sh
./rpcsx-os --system --safemode --mount $PATH_TO_YOUR_FW_ROOT / /mini-syscore.elf
./rpcsx --system --safemode --mount $PATH_TO_YOUR_FW_ROOT / /mini-syscore.elf
```
drop ```--safemode``` to have normal mode (not expected to produce graphics yet)
## Creating a log
Expand Down
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,7 @@ endfunction()
add_subdirectory(tools)

add_subdirectory(orbis-kernel)
add_subdirectory(rpcsx-os)
add_subdirectory(rpcsx-gpu)
add_subdirectory(hw/amdgpu)
add_subdirectory(rpcsx)
add_subdirectory(rx)

target_compile_definitions(rx PRIVATE
Expand Down
7 changes: 0 additions & 7 deletions hw/amdgpu/CMakeLists.txt

This file was deleted.

17 changes: 0 additions & 17 deletions hw/amdgpu/bridge/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit 0c16e29

Please sign in to comment.