feat: move nsight aftermath to module ( Silverlan/pr_nsight_aftermath )

build_scripts/build.py

@@ -767,7 +767,8 @@ def execbuildscript(filepath):
 		"execbuildscript": execbuildscript,
 		"str2bool": str2bool,
 		"install_prebuilt_binaries": install_prebuilt_binaries,
-		"reset_to_commit": reset_to_commit
+		"reset_to_commit": reset_to_commit,
+		"add_pragma_module": add_pragma_module
 	}
 	if platform == "linux":
 		l["c_compiler"] = c_compiler
@@ -820,7 +821,7 @@ def execbuildscript(filepath):
 if with_essential_client_modules:
 	add_pragma_module(
 		name="pr_prosper_vulkan",
-		commitSha="1cab6a2cc1cfb5ab3f5e45e0b454d9638ef3e87f",
+		commitSha="b878be11c48f9b6e11fae8b4395b3ba78551569b",
 		repositoryUrl="https://github.com/Silverlan/pr_prosper_vulkan.git"
 	)
 
@@ -914,7 +915,10 @@ def execbuildscript(filepath):
 # CMake configuration explicitly if they should be disabled.
 shippedModules = ["pr_audio_dummy","pr_prosper_opengl","pr_prosper_vulkan","pr_curl"]
 
-for module in module_info:
+index = 0
+# The module list can be modified during iteration, so we have to use a while loop here.
+while index < len(module_info):
+	module = module_info[index]
 	global moduleName
 	moduleName = module["name"]
 	moduleUrl = module["repositoryUrl"]
@@ -945,6 +949,7 @@ def execbuildscript(filepath):
 
 	if not skipBuildTarget:
 		module_list.append(moduleName)
+	index += 1
 
 for module in shippedModules:
 	if module != "pr_curl": # Curl is currently required

build_scripts/scripts/external_libs.py

@@ -16,7 +16,7 @@
 get_submodule("mathutil","https://github.com/Silverlan/mathutil.git","e872f599805cf696ff6a84a4253fc44ae8e83a15")
 get_submodule("networkmanager","https://github.com/Silverlan/networkmanager.git","981bc5809c1a768267ddace778205e1be0262730")
 get_submodule("panima","https://github.com/Silverlan/panima.git","06916dd30cde319f31b1eee25cfed7dea8f14630")
-get_submodule("prosper","https://github.com/Silverlan/prosper.git","c38390b43d2072bf0a9507d4218ea35b7af4785d")
+get_submodule("prosper","https://github.com/Silverlan/prosper.git","958b514432224057fb9af6d530eeaeb236cd3656")
 get_submodule("sharedutils","https://github.com/Silverlan/sharedutils.git","65031009e7f85722f243a493ad47e03ca10617fe")
 get_submodule("util_bsp","https://github.com/Silverlan/util_bsp.git","2d912cceaaa59199a86431aa9d194e922b2ebea4")
 get_submodule("util_formatted_text","https://github.com/Silverlan/util_formatted_text.git","c473a2bdc1ad84ef52d391226d6983ef3076958e")

build_scripts/scripts/modules.py

@@ -12,6 +12,6 @@
 get_submodule("pr_audio_dummy","https://github.com/Silverlan/pr_audio_dummy.git","1a806a1a7b2283bd8551d07e4f1d680499f68b90")
 get_submodule("pr_curl","https://github.com/Silverlan/pr_curl.git","974c67cc76710809a9595fcfbc4167554799cd7f")
 get_submodule("pr_prosper_opengl","https://github.com/Silverlan/pr_prosper_opengl.git","9cf6bc0b8b26cbd044c2e202dc9be57cc87e7e1b")
-get_submodule("pr_prosper_vulkan","https://github.com/Silverlan/pr_prosper_vulkan.git","1cab6a2cc1cfb5ab3f5e45e0b454d9638ef3e87f")
+get_submodule("pr_prosper_vulkan","https://github.com/Silverlan/pr_prosper_vulkan.git","b878be11c48f9b6e11fae8b4395b3ba78551569b")
 
 os.chdir(curDir)

core/client/src/c_engine.cpp

@@ -91,9 +91,6 @@ void DLLCLIENT RunCEngine(int argc, char *argv[])
 	en = nullptr;
 }
 }
-#ifdef PRAGMA_ENABLE_NSIGHT_AFTERMATH
-void enable_nsight_aftermath_crash_tracker();
-#endif
 
 DLLCLIENT CEngine *c_engine = NULL;
 extern DLLCLIENT ClientState *client;
@@ -124,9 +121,6 @@ CEngine::CEngine(int argc, char *argv[])
       m_farZ(pragma::BaseEnvCameraComponent::DEFAULT_FAR_Z), m_fps(0), m_tFPSTime(0.f), m_tLastFrame(util::Clock::now()), m_tDeltaFrameTime(0), m_audioAPI {"fmod"}
 {
 	c_engine = this;
-#ifdef PRAGMA_ENABLE_NSIGHT_AFTERMATH
-	enable_nsight_aftermath_crash_tracker();
-#endif
 	RegisterCallback<void, std::reference_wrapper<const GLFW::Joystick>, bool>("OnJoystickStateChanged");
 	RegisterCallback<void, std::reference_wrapper<std::shared_ptr<prosper::IPrimaryCommandBuffer>>>("DrawFrame");
 	RegisterCallback<void>("PreDrawGUI");