Xbox NXDK platform #4838

glebm · 2022-07-01T09:08:33Z

DevilutionX now builds with https://github.com/XboxDev/nxdk.

Reported 26 FPS on a real Xbox in town.

There are some outstanding PRs to fix a few issues (listed below), so we build from my fork for now.

Note: Requires clang that comes with Ubuntu 22.04 (20.04 won't work).

Issues:

AJenbo · 2022-07-01T14:23:45Z

Wow, it would be exciting to finally have an OG Xbox port under our wings :)

Looks like building fmt is currently the biggest blocker.

AJenbo · 2022-07-01T14:44:55Z

@brentdc-nz you might be interested in this :)

glebm · 2022-07-06T10:48:28Z

@Halofreak1990 I've noticed your port of Devilution (not DevilutionX) to the OG Xbox at https://github.com/Halofreak1990/devilution-xbox. This is a port of DevilutionX to the OG Xbox using NXDK that you might be interested in.

Halofreak1990 · 2022-07-06T11:14:07Z

@Halofreak1990 I've noticed your port of Devilution (not DevilutionX) to the OG Xbox at https://github.com/Halofreak1990/devilution-xbox. This is a port of DevilutionX to the OG Xbox using NXDK that you might be interested in.

Could be interesting indeed. The reason I went with the Devilution codebase for my port and tried emulating all the Windows stuff, was because DevilutionX depends on SDL2, among other things, and I do not have access to a port of that for the OG Xbox, and I'm not comfortable (like, not at all) with SDL to even try attempting swapping to the SDL 1.x port that does exist. There's also the bit with the modern C++ stuff that Visual Studio 2003--which, up until NXDK came around, was required to build OG Xbox games--just doesn't take.

And then I got stuck on trying to wrap my head around an implementation of the Win32 dialog API, though I did manage to include the resources in the executable and access them. I just didn't get around to rendering anything.

glebm · 2022-07-06T11:19:21Z

@Halofreak1990 DevilutionX does support SDL1 (-DUSE_SDL1=ON) but luckily we can use SDL2 with NXDK. I've had a few issues porting via NXDK as well but thankfully NXDK folks were very helpful on GitHub and their Discord.

ISO is not useful for us because the user still has to put diabdat.mpq on the hard drive. At this point, might as well put DevilutionX on the hard drive as well. Changes the CI to produce a zip file with our assets and the `default.xbe` executable.

1. Automount D drive 2. Mount E drive 3. Set preference and config paths to `E:\UDATA\devilutionx` Co-authored-by: Ryzee119 <[email protected]>

Looks like vsync doesn't work on NXDK at the moment. Defaults it to false and hides it from the menu. It is still possible to manually enable it via `diablo.ini` for testing.

AJenbo · 2022-07-09T17:50:35Z

Source/utils/display.cpp

+			if (windowSize.width >= xmode.width && windowSize.height == xmode.height)
+				break;


This logic could be better, but lets wait until XNDK gets the SDL calls implemented.

AJenbo · 2022-07-09T17:51:26Z

@glebm will you create an issue to track the remaning issues?

AJenbo · 2022-07-09T17:55:53Z

Also I guess we should look at packaging, but it seams it would be pretty trivial?

AJenbo · 2022-07-16T01:27:30Z

looks like everything is handled upstream. should we update things?

glebm · 2022-07-16T07:37:50Z

Still need XboxDev/nxdk#606, and then I guess we'll need to fork libfmt into diasurgical

Also I guess we should look at packaging, but it seams it would be pretty trivial?

The package is just a zip file that we already produce

glebm · 2022-07-16T08:45:42Z

Switched to our libfmt fork in #5011

JayFoxRox · 2022-07-19T07:57:51Z

.github/workflows/xbox_nxdk.yml

+    - name: Install APT packages
+      run: sudo apt-get update && sudo apt-get install -y clang llvm lld bison flex cmake git gettext
+
+    - name: Clone NXDK Repo


nit: The preferred spelling of nxdk is "nxdk" (all lowercase, even as first word in sentence).
Initially there were some disagreements about that spelling, but we settled on the all-lowercase variant a couple of years ago (if I remember correctly, also to differentiate it from the MS XDK). All-caps NXDK is only used in code for defines and such.

There were other instances in this PR which use the all-caps spelling, too.

Slightly related: While MS didn't agree on a stylization around 2001, the XboxDev community prefers to use the now-preferred MS spelling of "Xbox" (capital "X", lower-case "box") for the console name. If there might be confusion with other consoles, "original Xbox" is used ("original" in lowercase unless at start of sentence or similar).

Thanks, noted!

glebm mentioned this pull request Jul 1, 2022

Xbox next #760

Closed

glebm force-pushed the xbox-nxdk branch 5 times, most recently from a19084e to cba8b50 Compare July 1, 2022 10:06

AJenbo mentioned this pull request Jul 1, 2022

[Feature Request] Update XBox Port #3630

Closed

glebm force-pushed the xbox-nxdk branch from cba8b50 to f2da1d0 Compare July 1, 2022 15:11

glebm mentioned this pull request Jul 2, 2022

Do not treat NXDK as Windows diasurgical/libmpq#10

Merged

glebm force-pushed the xbox-nxdk branch 10 times, most recently from a57403f to 10273c5 Compare July 3, 2022 22:32

glebm marked this pull request as ready for review July 3, 2022 22:32

glebm enabled auto-merge (rebase) July 3, 2022 22:45

AJenbo force-pushed the xbox-nxdk branch 2 times, most recently from ee2d9b9 to 55e6bb6 Compare July 4, 2022 01:28

glebm force-pushed the xbox-nxdk branch 5 times, most recently from 07ed0ba to c0fcb17 Compare July 4, 2022 10:35

glebm force-pushed the xbox-nxdk branch 5 times, most recently from 28a7f70 to 78f6efa Compare July 6, 2022 09:54

glebm force-pushed the xbox-nxdk branch from 78f6efa to 4909e62 Compare July 6, 2022 11:02

glebm mentioned this pull request Jul 6, 2022

Various non-Xbox-specific fixes from xbox-nxdk branch #4901

Merged

glebm force-pushed the xbox-nxdk branch 2 times, most recently from 4e1a295 to a65a977 Compare July 7, 2022 01:50

glebm and others added 8 commits July 7, 2022 08:44

Xbox NXDK platform

2e75c0e

[xbox] Initialize the video system and specify search path

a33e3ea

Xbox NXDK: Generate ISO

445b4ba

Xbox NXDK: Build a zip instead of iso

e934a57

ISO is not useful for us because the user still has to put diabdat.mpq on the hard drive. At this point, might as well put DevilutionX on the hard drive as well. Changes the CI to produce a zip file with our assets and the `default.xbe` executable.

Xbox NXDK: Handle drives

64f3b41

1. Automount D drive 2. Mount E drive 3. Set preference and config paths to `E:\UDATA\devilutionx` Co-authored-by: Ryzee119 <[email protected]>

Xbox NXDK: Default vsync to false and hide option

2f1b82f

Looks like vsync doesn't work on NXDK at the moment. Defaults it to false and hides it from the menu. It is still possible to manually enable it via `diablo.ini` for testing.

Xbox NXDK: Disable upscaling by default

c22df26

Xbox NXDK: Add xbe logo

88c7aca

glebm force-pushed the xbox-nxdk branch from a65a977 to 88c7aca Compare July 7, 2022 07:44

AJenbo approved these changes Jul 9, 2022

View reviewed changes

glebm merged commit 15bb2f4 into diasurgical:master Jul 9, 2022

glebm deleted the xbox-nxdk branch July 9, 2022 19:53

JayFoxRox reviewed Jul 19, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Xbox NXDK platform #4838

Xbox NXDK platform #4838

glebm commented Jul 1, 2022 •

edited

Loading

AJenbo commented Jul 1, 2022 •

edited

Loading

AJenbo commented Jul 1, 2022

glebm commented Jul 6, 2022 •

edited

Loading

Halofreak1990 commented Jul 6, 2022

glebm commented Jul 6, 2022 •

edited

Loading

AJenbo Jul 9, 2022

AJenbo commented Jul 9, 2022

AJenbo commented Jul 9, 2022

AJenbo commented Jul 16, 2022

glebm commented Jul 16, 2022

glebm commented Jul 16, 2022

JayFoxRox Jul 19, 2022

glebm Jul 19, 2022

		if (windowSize.width >= xmode.width && windowSize.height == xmode.height)
		break;

Xbox NXDK platform #4838

Xbox NXDK platform #4838

Conversation

glebm commented Jul 1, 2022 • edited Loading

AJenbo commented Jul 1, 2022 • edited Loading

AJenbo commented Jul 1, 2022

glebm commented Jul 6, 2022 • edited Loading

Halofreak1990 commented Jul 6, 2022

glebm commented Jul 6, 2022 • edited Loading

AJenbo Jul 9, 2022

Choose a reason for hiding this comment

AJenbo commented Jul 9, 2022

AJenbo commented Jul 9, 2022

AJenbo commented Jul 16, 2022

glebm commented Jul 16, 2022

glebm commented Jul 16, 2022

JayFoxRox Jul 19, 2022

Choose a reason for hiding this comment

glebm Jul 19, 2022

Choose a reason for hiding this comment

glebm commented Jul 1, 2022 •

edited

Loading

AJenbo commented Jul 1, 2022 •

edited

Loading

glebm commented Jul 6, 2022 •

edited

Loading

glebm commented Jul 6, 2022 •

edited

Loading