WIP: Nintendo Switch (libnx) Port - Reference PR #12323

m4xw · 2019-09-13T14:01:07Z

After talking with @hrydgard, we decided I should open the PR already (also with 1.9.0 around the corner).
There are still quite a few Issues with the code that I didn't clean up yet.
I am aware of almost all issues.

GL Loader macro hackery (can be cleaned up and made properly for all platforms, but since we HAVE to resolve ALL functions dynamically on switch, I went for the lazy way)
CMake Issues with static platforms (will need help here to solve that, also needs a change in the glslang CMake file to not link to OS dependent, better solutions?)
Some Issues with SDL GL context creation, we need 0,0 to get full GL as ver, otherwise we will only get GLES, I just whipped that together without considerations for other platforms currently.
Standalone works with GLES2, GLES3, GL. Libretro with GL.
File API macro shenanigans
Lots of macro declares could be unified in a header (open for consideration)
JIT Alloc stuff needs more sanity checks (can sometimes randomly fail, but rarely, likely due to aslr placement, not sure yet).
No more masking needed (still needs more checks as said above)
I also probably broke other platforms here and there (also am aware of most places, but I guess you all know the drill).
Toolchain missing strnlen, realpath and std::thread::detach (made it a minefield..)
So some stuff had to actually be joined (Local file loader etc), otherwise crashes..
Consistent indentation and line-endings
Need to fix some whacky Path management that I have right now (because of how hbmenu/hbloader works)
I probably forgot quite a bit, but just don't hesitate to ask.

This is still in a WIP state since I kinda got sidetracked with the standalone port when I started the cleanup.
A minimal libretro common is added, it can be cut even further, in the end I just needed a few headers but not the full statemachine (glsm). Ignore that for now.

Also the gl_common stuff was generated with some notepad++ macros.
I made a branch with the squashed history of this PR and libretro-common ripped out for easy review here: m4xw@7ff8d94

The current rebased changes (today) seem to run fine but further testing is needed from my part.

Total relevant changes ~800loc.
Don't merge it anytime soon, also I might swap the branch later to "switch", which currently still has non-squashed changes)

m4xw · 2019-11-22T22:54:19Z

Pushed my rebased branch, still in testing but so far no regressions, will push it to my other branches later on.
Edit: Seems the libretro core build works but i need some simple fixups for standalone, might be fixed by the time u read it.

@hrydgard @unknownbrackets

LunaMoo · 2019-11-22T23:35:24Z

Just a nitpick/annoyance, I saw comments that some of that code was copied from elsewhere, but could you fix the indent? We use tabs in this project. Also place curly braces on the end of the line instead of a new line please. It's pretty ugly to read stuff when parts of the same code are using different style.

m4xw · 2019-11-22T23:56:45Z

@LunaMoo

unknownbrackets

Seems like there are multiple cores updating the libretro headers. Maybe it'd be best to update them once in a separate pull?

-[Unknown]

unknownbrackets · 2020-02-15T22:01:42Z

UI/NativeApp.cpp

-	g_Config.memStickDirectory = config + "/ppsspp/";
-	g_Config.flash0Directory = File::GetExeDirectory() + "/assets/flash0/";
+	g_Config.memStickDirectory = g_Config.internalDataDirectory + config + "/ppsspp/";
+	g_Config.flash0Directory = g_Config.internalDataDirectory + "assets/flash0/";


These changes shouldn't be needed (or the above), since it should be using the #elif PPSSPP_PLATFORM(SWITCH) path on switch.

-[Unknown]

Ok I can double check this.

ext/native/thread/executor.cpp

unknownbrackets · 2020-02-15T22:07:24Z

Common/CommonFuncs.h

@@ -31,6 +31,8 @@

 #if defined(_M_IX86) || defined(_M_X86)
 #define Crash() {asm ("int $3");}
+#elif defined(HAVE_LIBNX)
+#define Crash() { while(1); };


Hm, this seems decidedly not a crash... can we just use like *(int *)0 = 0x1337;?

-[Unknown]

We can also install a full exception handler if needed + do a context restore, got it all ready in another project.
But yes, we can even throw a fatal, but that would cause a full reboot.

m4xw · 2020-02-15T22:13:36Z

Seems like there are multiple cores updating the libretro headers. Maybe it'd be best to update them once in a separate pull?

-[Unknown]

Yea it caused me some hassle already, I still have some stupid changes in there I think that are just redundant, need to take a look on that.

Not sure which of these are even required anymore.

m4xw · 2020-03-11T14:43:54Z

@unknownbrackets just fyi pushed my rebase, I left extra commits in for now so we can see some relevant changes, will squash it the next time, ignore the gitlab file for now.
Also I didn't incorporate the recent discussions yet.
You might want to import the following toolchain related changes related to the launch browser stuff already again (SDL/SDLMain.cpp)

unknownbrackets

Looked for a reason for vertexjit crashes, didn't see one.

Are ALL_CALLEE_SAVED / ALL_CALLEE_SAVED_FP correct on Switch?

-[Unknown]

unknownbrackets · 2020-03-15T14:48:39Z

SDL/SDLMain.cpp

@@ -555,7 +564,7 @@ int main(int argc, char *argv[]) {
 	if (mode & SDL_WINDOW_FULLSCREEN_DESKTOP) {
 		pixel_xres = g_DesktopWidth;
 		pixel_yres = g_DesktopHeight;
-		g_Config.bFullScreen = true;
+		g_Config.bFullScreen = false;


Any specific reason to force this false?

-[Unknown]

cant remember, mightve been smth with docked maybe

Core/HLE/sceKernelSemaphore.h

Core/HLE/sceKernelMutex.h

unknownbrackets · 2020-05-17T03:35:21Z

Common/GL/GLInterface/GLInterface.cpp

@@ -7,7 +7,7 @@

 #ifdef __ANDROID__
 #include "Common/GL/GLInterface/EGLAndroid.h"
-#elif PPSSPP_PLATFORM(SWITCH)
+#elif defined(HAVE_LIBNX)


Is this intentional? Any specific reason not to use PPSSPP_PLATFORM(SWITCH)?

-[Unknown]

ext/native/file/file_util.cpp

ext/native/base/stringutil.h

unknownbrackets · 2020-05-17T03:44:19Z

UI/GameSettingsScreen.cpp

@@ -1164,8 +1165,10 @@ void GameSettingsScreen::onFinish(DialogResult result) {
 	KeyMap::UpdateNativeMenuKeys();

 	// Wipe some caches after potentially changing settings.
+#ifndef HAVE_LIBNX


Was there a problem this caused?

This will prevent some features from working, like post-processing shaders and certain settings changes.

-[Unknown]

IIrc some stuff triggered a context reset(?) and that caused a crash

Core/Util/GameManager.cpp

Core/MIPS/MIPSDebugInterface.cpp

Core/HLE/sceKernelThread.h

unknownbrackets · 2022-04-02T23:41:53Z

Common/StringUtils.cpp

+#include <stdio.h>
 #include <cstdio>


So using cstudio doesn't work? I guess we should just only do stdio.h then.

-[Unknown]

Common/CodeBlock.h

m4xw · 2023-06-21T16:25:21Z

Pushed WIP rebase, not much cleanup done yet, only the most important ones. Most critical issue on this one is we need to deal with the detach in ThreadManager::EnqueueTask

[Sqash me] Fixes after rebase [Squash me] Revert reporting disable for standalone [Squash me] Change GLInterface macro define for libretro purpose Rework JIT Integration/Masking -Needs more changes/reverts later on, WIP WIP fixes after rebase, confirmed partially working at least More safe buffer sizes Make it link after rebase gl3stub not required for switch Note: glBindFragDataLocationEXT, glGetProgramResourceLocationIndexEXT, glGetFragDataIndexEXT don't get currently populated Dirty fix libnx libretro core Compile and link after rebase for libretro Compile and link after rebase for standalone Fixes after rebase [CI/CD] Libretro CI only for Switch [CI/CD] Makefile path fix Fixes after rebase Split off libretro-common for Switch [Libnx] Fixes after rebase [Libnx] Remove leftover Rebase fixes Critical mitigation, cant call detach Fixes after first batch of PR's No longer required

m4xw · 2024-09-11T14:13:27Z

Review commit: m4xw@871d5de

m4xw force-pushed the staging branch from 37ed42c to de7db87 Compare September 25, 2019 20:13

This was referenced Sep 28, 2019

Pull some base parts of the Switch PR #12370

Merged

Avoid thread.detach(), join when needed instead #12371

Merged

m4xw force-pushed the staging branch from de7db87 to 49e7971 Compare November 22, 2019 22:53

unknownbrackets reviewed Feb 15, 2020

View reviewed changes

unknownbrackets mentioned this pull request Mar 4, 2020

Core: Bring over some file IO related Switch changes #12676

Merged

m4xw force-pushed the staging branch from 5d7e8c2 to b475e73 Compare March 11, 2020 14:41

unknownbrackets mentioned this pull request Mar 15, 2020

Pull more safe parts in from Switch port #12710

Merged

m4xw force-pushed the staging branch from b475e73 to 244a601 Compare May 9, 2020 17:30

unknownbrackets reviewed May 17, 2020

View reviewed changes

unknownbrackets mentioned this pull request May 17, 2020

Switch: Be more consistent about writable code pointers #12914

Merged

m4xw force-pushed the staging branch from 244a601 to 705dfa0 Compare October 20, 2020 17:14

m4xw force-pushed the staging branch from 705dfa0 to bcedecd Compare March 4, 2021 12:07

unknownbrackets mentioned this pull request Mar 5, 2021

Bring over some networking related Switch changes #14264

Merged

m4xw force-pushed the staging branch from 9f536f7 to feea22c Compare June 15, 2021 21:25

unknownbrackets mentioned this pull request Jan 10, 2022

Nintendo Switch builds for 1.12.3 release #15252

Open

2 tasks

m4xw force-pushed the staging branch from feea22c to 92230f9 Compare March 30, 2022 09:56

unknownbrackets reviewed Apr 2, 2022

View reviewed changes

unknownbrackets mentioned this pull request Apr 2, 2022

Cleanup Switch ignoring of Vulkan #15468

Merged

m4xw force-pushed the staging branch from 92230f9 to bb25be2 Compare August 19, 2022 14:36

unknownbrackets reviewed Aug 20, 2022

View reviewed changes

Common/CodeBlock.h Outdated Show resolved Hide resolved

m4xw force-pushed the staging branch from acdd98f to de09715 Compare June 21, 2023 16:24

m4xw force-pushed the staging branch 2 times, most recently from 292913a to 785bdc7 Compare June 27, 2023 16:31

m4xw added 7 commits September 10, 2024 12:46

Add minimal libretro-common

8786283

[LIBNX] Hacky GL loader (re-visit later)

976899b

Remove -ldl from main CMakeLists

b8fd575

Fix audio playback

905dead

Conflicting declaration for Arm64Emitter

756a041

Fixes after rebase

1b3cdc1

m4xw force-pushed the staging branch from 785bdc7 to 1b3cdc1 Compare September 11, 2024 14:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: Nintendo Switch (libnx) Port - Reference PR #12323

WIP: Nintendo Switch (libnx) Port - Reference PR #12323

m4xw commented Sep 13, 2019 •

edited

Loading

m4xw commented Nov 22, 2019 •

edited

Loading

LunaMoo commented Nov 22, 2019

m4xw commented Nov 22, 2019

unknownbrackets left a comment

unknownbrackets Feb 15, 2020

m4xw Feb 15, 2020

unknownbrackets Feb 15, 2020

m4xw Feb 15, 2020

m4xw commented Feb 15, 2020

m4xw commented Mar 11, 2020 •

edited

Loading

unknownbrackets left a comment

unknownbrackets Mar 15, 2020

m4xw Jun 16, 2021

unknownbrackets May 17, 2020

unknownbrackets May 17, 2020

m4xw Jun 16, 2021

unknownbrackets Apr 2, 2022

m4xw commented Jun 21, 2023

m4xw commented Sep 11, 2024

WIP: Nintendo Switch (libnx) Port - Reference PR #12323

Are you sure you want to change the base?

WIP: Nintendo Switch (libnx) Port - Reference PR #12323

Conversation

m4xw commented Sep 13, 2019 • edited Loading

m4xw commented Nov 22, 2019 • edited Loading

LunaMoo commented Nov 22, 2019

m4xw commented Nov 22, 2019

unknownbrackets left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

m4xw commented Feb 15, 2020

m4xw commented Mar 11, 2020 • edited Loading

unknownbrackets left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

m4xw commented Jun 21, 2023

m4xw commented Sep 11, 2024

m4xw commented Sep 13, 2019 •

edited

Loading

m4xw commented Nov 22, 2019 •

edited

Loading

m4xw commented Mar 11, 2020 •

edited

Loading