Build for PS2 #5238

AJenbo · 2022-08-13T14:56:08Z

docker run -it -w /project -v $(pwd):/project ps2dev/ps2dev sh

apk add git make cmake gmp mpc1 mpfr

git config --global --add safe.directory /project

cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=/usr/local/ps2dev/ps2sdk/ps2dev.cmake

cmake --build build -j $(nproc)

if you need to build the SDK (don't forget to clone and build ps2_drivers) you will also need this:

apk add musl-dev gcc bash

todo

ReadOnlyTest() is creating a folder instead of a file, and fails to delete it, failing next lauch
Resolution is 640x448 ~~instead of 640x480~~ which is the max PS2 can do
Implement truncate ps2dev/ps2sdk#322
Add support for 8bit wave files in adpenc ps2dev/ps2sdk#397
Implement positional audio in adpcm ps2dev/ps2sdk#398
audsrv: Fix sterio calculations ps2dev/ps2sdk#404
Return an error when out of SPU memory ps2dev/ps2sdk#405
Implement audsrv_free_adpcm ps2dev/ps2sdk#406
Implement audsrv_is_adpcm_playing ps2dev/ps2sdk#407
Return channel id when sample is successufully started ps2dev/ps2sdk#408
Read pitch and channels from header instead of hardcoding them ps2dev/ps2sdk#410
Remove unused player sounds to get below the 2MB audio limit
- Remove unused Warrior sounds #5820
No audio on videos (works via audiolib, maybe just enable that again)
Writing saves fails on hardware
Wrong sounds are being played in various cases on hardware and there are clicks and pops

Side note

Initially we tried using SDL1.2, but the version provided by ps2sdk is 1.2.8 and we expect 1.2.10. There is also an issue with there port not correctly implementing Uint64. Solving that wasn't to big of an issue, but the game gets stuck during SDL_JoystickInit, so instead we for now have opted for SDL2 which went much smoother.

glebm · 2022-11-05T12:45:07Z

The CLX stuff is done and PS2 SDK recently received lots of updates, might be a good time to give this another go!

set(BUILD_ASSETS_MPQ OFF)
set(UNPACKED_MPQS ON)

https://github.com/diasurgical/devilutionx-mpq-tools

AJenbo · 2023-01-17T03:40:15Z

Slight update, the latest build chain fixes the ReadOnlyTest issue as well as remove the need for building the drivers.
Currently the game is crashing for me when loading town.

AJenbo · 2023-01-17T23:05:00Z

Everything appears to be working now with streaming audio (currently requires individual files and not using an MPQ)... but the PS2 only allows 16 files to be open at the same time meaning that we can't open all the needed audio files for streaming. So that's something we might have to look in to a solution for.

glebm · 2023-01-18T03:00:01Z

It should now allow up to 128 open files ps2dev/ps2sdk#396

CMake/platforms/ps2.cmake

glebm · 2023-02-12T10:37:00Z

Source/storm/storm_svid.cpp

+#ifndef PS2
 #ifndef NOSOUND


Consider doing this instead throughout:

#if !defined(NOSOUND) && !defined(PS2)

Yeah, the svid portion is still just a the stage where i stubbed everything out to avoid linking with audiolib. I still have to find the best way to bring video sound back up.

glebm · 2023-02-12T10:40:10Z

Source/utils/soundsample.cpp

+		AssetHandle handle = OpenAsset(file_path_.c_str(), size);
+		if (handle.ok()) {
+			size -= 16;
+			uint32_t buffer[3];
+			if (handle.read(buffer, sizeof(buffer))) {
+				pitch = buffer[2];
+			}
+		}


It's a bit surprising to have GetLength() open a file.
This should probably be done when the SoundSample is constructed.

glebm · 2023-02-12T10:42:26Z

Source/utils/soundsample.h

+	audsrv_adpcm_t *sampleId_ = nullptr;
+	std::unique_ptr<audsrv_adpcm_t> stream_;


Consider a bool owned_; instead. Or simply std::shared_ptr

glebm · 2023-02-12T10:43:21Z

Source/utils/display.cpp

+#ifndef PS2
 	texture = SDLWrap::CreateTexture(renderer, SDL_PIXELFORMAT_RGB888, SDL_TEXTUREACCESS_STREAMING, gnScreenWidth, gnScreenHeight);
+#else
+	texture = SDLWrap::CreateTexture(renderer, SDL_PIXELFORMAT_ABGR1555, SDL_TEXTUREACCESS_STREAMING, gnScreenWidth, gnScreenHeight);
+#endif


Consider doing it more generally by adding a CMake define for DEVILUTIONX_DISPLAY_TEXTURE_FORMAT (can then be used in storm_svid.cpp as well)

This give us 2MB of dedicated audio memory and support for compressed audio at runtime which is a huge boost to the already limited system memory

List taken from the PS2 PR (diasurgical#5238)

List taken from the PS2 PR (diasurgical#5238) Regexp used for removal: ``` PS_(WARR|ROGUE|MAGE|MONK)(14B|14C|16B|16C|17|18|19|20|21|22|23|25|26|28|30|31|32|33|36|37|38|39|40|41|42|44|45|47|48|57|64|65|66|67|72|73|74|75|76|77|78|97|98)\b ```

glebm · 2023-09-02T10:44:50Z

Source/effects.cpp

+/*PS_WARR16B*/    { sfx_STREAM,               "sfx\\warrior\\wario16b.wav",  nullptr },
+/*PS_WARR16C*/    { sfx_STREAM,               "sfx\\warrior\\wario16c.wav",  nullptr },
+/*PS_WARR17*/     { sfx_STREAM,               "sfx\\warrior\\warior17.wav",  nullptr },
+/*PS_WARR18*/     { sfx_STREAM,               "sfx\\warrior\\warior18.wav",  nullptr },


I don't think this is correct.
This file is "Not a chance" and it is actually used (HeroSpeech::NotAChance)

AJenbo force-pushed the ps2 branch 4 times, most recently from 8981e82 to dfb7f2a Compare August 13, 2022 17:36

AJenbo added the platform support label Aug 13, 2022

AJenbo force-pushed the ps2 branch 6 times, most recently from 74521db to 2ee918d Compare August 15, 2022 06:08

AJenbo force-pushed the ps2 branch from 2ee918d to 549c525 Compare January 17, 2023 23:03

glebm reviewed Jan 18, 2023

View reviewed changes

CMake/platforms/ps2.cmake Outdated Show resolved Hide resolved

glebm reviewed Jan 18, 2023

View reviewed changes

CMake/platforms/ps2.cmake Outdated Show resolved Hide resolved

AJenbo force-pushed the ps2 branch 2 times, most recently from a488eeb to a25fcda Compare January 21, 2023 15:10

AJenbo force-pushed the ps2 branch 2 times, most recently from 190499a to 3b2bc7a Compare February 4, 2023 06:49

AJenbo force-pushed the ps2 branch 3 times, most recently from 8aeb2ce to dd281a7 Compare February 11, 2023 22:16

glebm reviewed Feb 12, 2023

View reviewed changes

Disable unused sounds

e0ef01b

AJenbo added 3 commits February 12, 2023 14:38

Build for PS2

a8f2708

Fix upscaling on PS2

12d8ce6

Implement PS2 audio via SPU

246c6f9

This give us 2MB of dedicated audio memory and support for compressed audio at runtime which is a huge boost to the already limited system memory

AJenbo force-pushed the ps2 branch from dd281a7 to 9f94771 Compare February 13, 2023 19:24

AJenbo added 2 commits February 13, 2023 21:54

Only open one file at a time

39af364

Implement streaming

f73707d

AJenbo force-pushed the ps2 branch from 9f94771 to f73707d Compare February 13, 2023 20:55

glebm added a commit to glebm/devilutionX that referenced this pull request Feb 19, 2023

Remove unused Warrior sounds

c8d81f9

List taken from the PS2 PR (diasurgical#5238)

glebm mentioned this pull request Feb 19, 2023

Remove unused Warrior sounds #5820

Closed

glebm mentioned this pull request Sep 2, 2023

Remove unused Player sounds #6551

Closed

glebm reviewed Sep 2, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Build for PS2 #5238

Build for PS2 #5238

AJenbo commented Aug 13, 2022 •

edited

Loading

glebm commented Nov 5, 2022 •

edited

Loading

AJenbo commented Jan 17, 2023

AJenbo commented Jan 17, 2023

glebm commented Jan 18, 2023 •

edited

Loading

glebm Feb 12, 2023 •

edited

Loading

AJenbo Feb 12, 2023

glebm Feb 12, 2023

glebm Feb 12, 2023 •

edited

Loading

glebm Feb 12, 2023 •

edited

Loading

glebm Sep 2, 2023 •

edited

Loading

		audsrv_adpcm_t *sampleId_ = nullptr;
		std::unique_ptr<audsrv_adpcm_t> stream_;

Build for PS2 #5238

Are you sure you want to change the base?

Build for PS2 #5238

Conversation

AJenbo commented Aug 13, 2022 • edited Loading

todo

Side note

glebm commented Nov 5, 2022 • edited Loading

AJenbo commented Jan 17, 2023

AJenbo commented Jan 17, 2023

glebm commented Jan 18, 2023 • edited Loading

glebm Feb 12, 2023 • edited Loading

Choose a reason for hiding this comment

AJenbo Feb 12, 2023

Choose a reason for hiding this comment

glebm Feb 12, 2023

Choose a reason for hiding this comment

glebm Feb 12, 2023 • edited Loading

Choose a reason for hiding this comment

glebm Feb 12, 2023 • edited Loading

Choose a reason for hiding this comment

glebm Sep 2, 2023 • edited Loading

Choose a reason for hiding this comment

AJenbo commented Aug 13, 2022 •

edited

Loading

glebm commented Nov 5, 2022 •

edited

Loading

glebm commented Jan 18, 2023 •

edited

Loading

glebm Feb 12, 2023 •

edited

Loading

glebm Feb 12, 2023 •

edited

Loading

glebm Feb 12, 2023 •

edited

Loading

glebm Sep 2, 2023 •

edited

Loading