Port for PlayStation Portable support #5869
Conversation
| @@ -662,8 +662,10 @@ void multi_process_network_packets() | |||
| } | |||
| HandleAllPackets(playerId, (const byte *)(pkt + 1), dwMsgSize - sizeof(TPktHdr)); | |||
| } | |||
| #ifndef PSP | |||
| if (SErrGetLastError() != STORM_ERROR_NO_MESSAGES_WAITING) | |||
There was a problem hiding this comment.
Not exactly sure why the port is choking on this one, but we should probably investigate it a bit before just ignoring it like it did here.
There was a problem hiding this comment.
This should be fixed now and the workaround can be removed.
Source/utils/display.cpp
Outdated
| @@ -361,7 +361,11 @@ void ReinitializeTexture() | |||
| auto quality = StrCat(static_cast<int>(*sgOptions.Graphics.scaleQuality)); | |||
| SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, quality.c_str()); | |||
|
|
|||
| #ifdef PSP | |||
| texture = SDLWrap::CreateTexture(renderer, SDL_PIXELFORMAT_ABGR1555, SDL_TEXTUREACCESS_STREAMING, gnScreenWidth, gnScreenHeight); | |||
There was a problem hiding this comment.
A bit raw for now until I get a chance to test what works best on hardware, should move it to a define before merging.
There was a problem hiding this comment.
We now have DEVILUTIONX_DISPLAY_TEXTURE_FORMAT in CMake that we can use for this:
set(DEVILUTIONX_DISPLAY_TEXTURE_FORMAT "SDL_PIXELFORMAT_ABGR1555")Just this line needs to be updated as well to use DEVILUTIONX_DISPLAY_TEXTURE_FORMAT:
devilutionX/Source/storm/storm_svid.cpp
Line 382 in cc0d2e2
There was a problem hiding this comment.
Would it make sense to check what pixel formats are supported at runtime using SDL_GetRendererInfo?
There was a problem hiding this comment.
it might. psp supports 565, 5551 and 8888 afaik. I guess the problem is should we always select the lowest, highest or another? Or should we make this an option for the user in settings.
Often it really just makes sens to pick 1 for a given platform rather then having each user experiment with it.
There was a problem hiding this comment.
I think the important thing is to ensure that the requested pixel format is supported natively - the PSP (and PS2) supports SDL_PIXELFORMAT_ABGR8888 but not SDL_PIXELFORMAT_XRGB888, so requesting the latter format requires any data copied to the texture to be converted in software before it can be uploaded to the GPU. There might also be bandwidth advantage to using a 16-bit format over a 32-bit one, but other than that the specifics shouldn't matter too much.
That said, since devilutionX seems to be designed around palette-based displays, libsdl-org/SDL#6192 may be of interest here. It still needs more work before it can be merged, though.
There was a problem hiding this comment.
Ok, that isn't to much of a worry though, SDL_PIXELFORMAT_ABGR8888 is simply to slow on both platforms.
Hope you manage to finish the PR, could be useful if supported on most platforms.
|
PSP only supports power-of-two textures, but can't we use 1024x1024? |
|
Well the issue is width, not height :) |
|
@AJenbo looks like it didn't upload the artifact on CircleCI. Let me know when I can grab that and I can do a quick test on hardware (also if you want to just send me a few builds to test different configurations, just let me know). |
Oh, right. We can just blit the final surface to 2 side-by-side textures actually, since we render everything in software to an 8-bit surface first anyway. |
|
@stefanmielke thanks, I corrected the artifact path. |
|
@AJenbo got this error when running it: "The game could not be started (80020148)". Other homebrew run fine (also tested the Tyrian port). Additionally, I copied the other files next to the game at "PSP\GAME\DevilutionX", not sure if it was expecting them somewhere else. This is how it ended: To add more info, the game show the PSP logo at the start, then goes straight to a black screen, stays there for a couple seconds, and then crashes to the PSP homescreen with the message. |
|
@stefanmielke we got it running on hardware in case you want to mess a bit more with it. |
|
Everything is now working, only issue left is performance which is a good deal slower then what is ideal. |
| @@ -396,7 +400,11 @@ void RemoveFile(const char *path) | |||
| FILE *f = fopen(name.c_str(), "r+"); | |||
| if (f != nullptr) { | |||
| fclose(f); | |||
| #ifdef PSP | |||
| sceIoRemove(name.c_str()); | |||
There was a problem hiding this comment.
It'd be nice to add remove to the SDK instead. Filed pspdev/newlib#7
There was a problem hiding this comment.
remove is now in the SDK! pspdev/pspsdk#162
Things are now building pretty smoothly.
Running in the PPSSPP emulator:
https://www.youtube.com/watch?v=UmAv7nrME-I
It does look like it's unable to reinitialize the graphics system so we need to disable related options.
Also we need to find a good way to downscale to 480x272 on SDL2. The PSP only supports textures of 512x512 so it won't be able to do it using a single 847x480 texture. One option would running at 960x544 and then 1/2 scale it in software.
Todo