diff --git a/externals/sirit b/externals/sirit index b4eccb336..282083a59 160000 --- a/externals/sirit +++ b/externals/sirit @@ -1 +1 @@ -Subproject commit b4eccb336f1b1169af48dac1e04015985af86e3e +Subproject commit 282083a595dcca86814dedab2f2b0363ef38f1ec diff --git a/src/core/cpu_patches.cpp b/src/core/cpu_patches.cpp index e4f65cd31..8c0897a48 100644 --- a/src/core/cpu_patches.cpp +++ b/src/core/cpu_patches.cpp @@ -753,6 +753,10 @@ static bool PatchesIllegalInstructionHandler(void* context) { ZydisDecodedOperand operands[ZYDIS_MAX_OPERAND_COUNT]; const auto status = Common::Decoder::Instance()->decodeInstruction(instruction, operands, code_address); + if (ZYAN_SUCCESS(status) && instruction.mnemonic == ZydisMnemonic::ZYDIS_MNEMONIC_UD2) + [[unlikely]] { + UNREACHABLE_MSG("ud2 at code address {:#x}", (u64)code_address); + } LOG_ERROR(Core, "Failed to patch address {:x} -- mnemonic: {}", (u64)code_address, ZYAN_SUCCESS(status) ? ZydisMnemonicGetString(instruction.mnemonic) : "Failed to decode"); diff --git a/src/core/libraries/ajm/ajm.cpp b/src/core/libraries/ajm/ajm.cpp index 5c55d2c06..d8b1dc137 100644 --- a/src/core/libraries/ajm/ajm.cpp +++ b/src/core/libraries/ajm/ajm.cpp @@ -219,7 +219,7 @@ int PS4_SYSV_ABI sceAjmStrError() { return ORBIS_OK; } -void RegisterlibSceAjm(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("NVDXiUesSbA", "libSceAjm", 1, "libSceAjm", 1, 1, sceAjmBatchCancel); LIB_FUNCTION("WfAiBW8Wcek", "libSceAjm", 1, "libSceAjm", 1, 1, sceAjmBatchErrorDump); LIB_FUNCTION("dmDybN--Fn8", "libSceAjm", 1, "libSceAjm", 1, 1, sceAjmBatchJobControlBufferRa); diff --git a/src/core/libraries/ajm/ajm.h b/src/core/libraries/ajm/ajm.h index 34aeb9aa4..2c529cd4b 100644 --- a/src/core/libraries/ajm/ajm.h +++ b/src/core/libraries/ajm/ajm.h @@ -229,5 +229,5 @@ int PS4_SYSV_ABI sceAjmModuleRegister(u32 context, AjmCodecType codec_type, s64 int PS4_SYSV_ABI sceAjmModuleUnregister(); int PS4_SYSV_ABI sceAjmStrError(); -void RegisterlibSceAjm(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Ajm diff --git a/src/core/libraries/app_content/app_content.cpp b/src/core/libraries/app_content/app_content.cpp index fad270e2b..59497f847 100644 --- a/src/core/libraries/app_content/app_content.cpp +++ b/src/core/libraries/app_content/app_content.cpp @@ -369,7 +369,7 @@ int PS4_SYSV_ABI sceAppContentGetDownloadedStoreCountry() { return ORBIS_OK; } -void RegisterlibSceAppContent(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("AS45QoYHjc4", "libSceAppContent", 1, "libSceAppContentUtil", 1, 1, _Z5dummyv); LIB_FUNCTION("ZiATpP9gEkA", "libSceAppContent", 1, "libSceAppContentUtil", 1, 1, sceAppContentAddcontDelete); diff --git a/src/core/libraries/app_content/app_content.h b/src/core/libraries/app_content/app_content.h index 05bd3bc49..a8e1ee178 100644 --- a/src/core/libraries/app_content/app_content.h +++ b/src/core/libraries/app_content/app_content.h @@ -119,5 +119,5 @@ int PS4_SYSV_ABI sceAppContentGetAddcontInfoByEntitlementId(); int PS4_SYSV_ABI sceAppContentGetAddcontInfoListByIroTag(); int PS4_SYSV_ABI sceAppContentGetDownloadedStoreCountry(); -void RegisterlibSceAppContent(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::AppContent diff --git a/src/core/libraries/audio/audioin.cpp b/src/core/libraries/audio/audioin.cpp index 0a2489740..c227d8f15 100644 --- a/src/core/libraries/audio/audioin.cpp +++ b/src/core/libraries/audio/audioin.cpp @@ -218,7 +218,7 @@ int PS4_SYSV_ABI sceAudioInVmicWrite() { return ORBIS_OK; } -void RegisterlibSceAudioIn(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("IQtWgnrw6v8", "libSceAudioIn", 1, "libSceAudioIn", 1, 1, sceAudioInChangeAppModuleState); LIB_FUNCTION("Jh6WbHhnI68", "libSceAudioIn", 1, "libSceAudioIn", 1, 1, sceAudioInClose); diff --git a/src/core/libraries/audio/audioin.h b/src/core/libraries/audio/audioin.h index 28162d464..cbcee6d03 100644 --- a/src/core/libraries/audio/audioin.h +++ b/src/core/libraries/audio/audioin.h @@ -54,5 +54,5 @@ int PS4_SYSV_ABI sceAudioInVmicCreate(); int PS4_SYSV_ABI sceAudioInVmicDestroy(); int PS4_SYSV_ABI sceAudioInVmicWrite(); -void RegisterlibSceAudioIn(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::AudioIn diff --git a/src/core/libraries/audio/audioout.cpp b/src/core/libraries/audio/audioout.cpp index 9e809f4fe..2ec44e80f 100644 --- a/src/core/libraries/audio/audioout.cpp +++ b/src/core/libraries/audio/audioout.cpp @@ -611,7 +611,7 @@ int PS4_SYSV_ABI sceAudioOutSetSystemDebugState() { return ORBIS_OK; } -void RegisterlibSceAudioOut(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("cx2dYFbzIAg", "libSceAudioOutDeviceService", 1, "libSceAudioOut", 1, 1, sceAudioOutDeviceIdOpen); LIB_FUNCTION("tKumjQSzhys", "libSceAudioDeviceControl", 1, "libSceAudioOut", 1, 1, diff --git a/src/core/libraries/audio/audioout.h b/src/core/libraries/audio/audioout.h index ef1588954..5247561ee 100644 --- a/src/core/libraries/audio/audioout.h +++ b/src/core/libraries/audio/audioout.h @@ -182,5 +182,5 @@ int PS4_SYSV_ABI sceAudioOutSparkControlSetEqCoef(); int PS4_SYSV_ABI sceAudioOutSetSystemDebugState(); void AdjustVol(); -void RegisterlibSceAudioOut(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::AudioOut diff --git a/src/core/libraries/audio3d/audio3d.cpp b/src/core/libraries/audio3d/audio3d.cpp index 646c28949..abcd24041 100644 --- a/src/core/libraries/audio3d/audio3d.cpp +++ b/src/core/libraries/audio3d/audio3d.cpp @@ -526,11 +526,18 @@ s32 PS4_SYSV_ABI sceAudio3dStrError() { } s32 PS4_SYSV_ABI sceAudio3dTerminate() { - LOG_ERROR(Lib_Audio3d, "(STUBBED) called"); + LOG_INFO(Lib_Audio3d, "called"); + if (!state) { + return ORBIS_AUDIO3D_ERROR_NOT_READY; + } + + AudioOut::sceAudioOutOutput(state->audio_out_handle, nullptr); + AudioOut::sceAudioOutClose(state->audio_out_handle); + state.release(); return ORBIS_OK; } -void RegisterlibSceAudio3d(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("pZlOm1aF3aA", "libSceAudio3d", 1, "libSceAudio3d", 1, 1, sceAudio3dAudioOutClose); LIB_FUNCTION("ucEsi62soTo", "libSceAudio3d", 1, "libSceAudio3d", 1, 1, sceAudio3dAudioOutOpen); LIB_FUNCTION("7NYEzJ9SJbM", "libSceAudio3d", 1, "libSceAudio3d", 1, 1, diff --git a/src/core/libraries/audio3d/audio3d.h b/src/core/libraries/audio3d/audio3d.h index f4e9ada8a..1057c1f31 100644 --- a/src/core/libraries/audio3d/audio3d.h +++ b/src/core/libraries/audio3d/audio3d.h @@ -141,5 +141,5 @@ s32 PS4_SYSV_ABI sceAudio3dSetGpuRenderer(); s32 PS4_SYSV_ABI sceAudio3dStrError(); s32 PS4_SYSV_ABI sceAudio3dTerminate(); -void RegisterlibSceAudio3d(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Audio3d diff --git a/src/core/libraries/avplayer/avplayer.cpp b/src/core/libraries/avplayer/avplayer.cpp index 176fda137..b1009891e 100644 --- a/src/core/libraries/avplayer/avplayer.cpp +++ b/src/core/libraries/avplayer/avplayer.cpp @@ -278,7 +278,7 @@ s32 PS4_SYSV_ABI sceAvPlayerVprintf(const char* format, va_list args) { return ORBIS_OK; } -void RegisterlibSceAvPlayer(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("KMcEa+rHsIo", "libSceAvPlayer", 1, "libSceAvPlayer", 1, 0, sceAvPlayerAddSource); LIB_FUNCTION("x8uvuFOPZhU", "libSceAvPlayer", 1, "libSceAvPlayer", 1, 0, sceAvPlayerAddSourceEx); diff --git a/src/core/libraries/avplayer/avplayer.h b/src/core/libraries/avplayer/avplayer.h index 2d472f801..910f57c77 100644 --- a/src/core/libraries/avplayer/avplayer.h +++ b/src/core/libraries/avplayer/avplayer.h @@ -290,6 +290,6 @@ enum class SceAvPlayerAvSyncMode { using SceAvPlayerLogCallback = int PS4_SYSV_ABI (*)(void* p, const char* format, va_list args); -void RegisterlibSceAvPlayer(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::AvPlayer diff --git a/src/core/libraries/camera/camera.cpp b/src/core/libraries/camera/camera.cpp index 996d1c895..5cfa92af3 100644 --- a/src/core/libraries/camera/camera.cpp +++ b/src/core/libraries/camera/camera.cpp @@ -410,7 +410,7 @@ s32 PS4_SYSV_ABI sceCameraStopByHandle() { return ORBIS_OK; } -void RegisterlibSceCamera(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("QhjrPkRPUZQ", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraAccGetData); LIB_FUNCTION("UFonL7xopFM", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraAudioClose); LIB_FUNCTION("fkZE7Hup2ro", "libSceCamera", 1, "libSceCamera", 1, 1, sceCameraAudioGetData); diff --git a/src/core/libraries/camera/camera.h b/src/core/libraries/camera/camera.h index 51aa8b729..8eee94897 100644 --- a/src/core/libraries/camera/camera.h +++ b/src/core/libraries/camera/camera.h @@ -304,5 +304,5 @@ s32 PS4_SYSV_ABI sceCameraStartByHandle(); s32 PS4_SYSV_ABI sceCameraStop(s32 handle); s32 PS4_SYSV_ABI sceCameraStopByHandle(); -void RegisterlibSceCamera(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Camera \ No newline at end of file diff --git a/src/core/libraries/companion/companion_httpd.cpp b/src/core/libraries/companion/companion_httpd.cpp index 39081fa4e..1e91fa7f3 100644 --- a/src/core/libraries/companion/companion_httpd.cpp +++ b/src/core/libraries/companion/companion_httpd.cpp @@ -102,7 +102,7 @@ s32 PS4_SYSV_ABI sceCompanionHttpdUnregisterRequestCallback() { return ORBIS_OK; } -void RegisterlibSceCompanionHttpd(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("8pWltDG7h6A", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1, sceCompanionHttpdAddHeader); LIB_FUNCTION("B-QBMeFdNgY", "libSceCompanionHttpd", 1, "libSceCompanionHttpd", 1, 1, diff --git a/src/core/libraries/companion/companion_httpd.h b/src/core/libraries/companion/companion_httpd.h index b6d441653..bc6807fbc 100644 --- a/src/core/libraries/companion/companion_httpd.h +++ b/src/core/libraries/companion/companion_httpd.h @@ -87,5 +87,5 @@ s32 PS4_SYSV_ABI sceCompanionHttpdTerminate(); s32 PS4_SYSV_ABI sceCompanionHttpdUnregisterRequestBodyReceptionCallback(); s32 PS4_SYSV_ABI sceCompanionHttpdUnregisterRequestCallback(); -void RegisterlibSceCompanionHttpd(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::CompanionHttpd \ No newline at end of file diff --git a/src/core/libraries/companion/companion_util.cpp b/src/core/libraries/companion/companion_util.cpp index c144ebdcc..60bfeade3 100644 --- a/src/core/libraries/companion/companion_util.cpp +++ b/src/core/libraries/companion/companion_util.cpp @@ -56,7 +56,7 @@ s32 PS4_SYSV_ABI sceCompanionUtilTerminate() { return ORBIS_OK; } -void RegisterlibSceCompanionUtil(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("cE5Msy11WhU", "libSceCompanionUtil", 1, "libSceCompanionUtil", 1, 1, sceCompanionUtilGetEvent); LIB_FUNCTION("MaVrz79mT5o", "libSceCompanionUtil", 1, "libSceCompanionUtil", 1, 1, diff --git a/src/core/libraries/companion/companion_util.h b/src/core/libraries/companion/companion_util.h index 921b5b21e..e44b095ee 100644 --- a/src/core/libraries/companion/companion_util.h +++ b/src/core/libraries/companion/companion_util.h @@ -29,5 +29,5 @@ s32 PS4_SYSV_ABI sceCompanionUtilInitialize(); s32 PS4_SYSV_ABI sceCompanionUtilOptParamInitialize(); s32 PS4_SYSV_ABI sceCompanionUtilTerminate(); -void RegisterlibSceCompanionUtil(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::CompanionUtil \ No newline at end of file diff --git a/src/core/libraries/disc_map/disc_map.cpp b/src/core/libraries/disc_map/disc_map.cpp index e8b40e624..8b1e3c653 100644 --- a/src/core/libraries/disc_map/disc_map.cpp +++ b/src/core/libraries/disc_map/disc_map.cpp @@ -34,7 +34,7 @@ int PS4_SYSV_ABI Func_E7EBCE96E92F91F8() { return ORBIS_DISC_MAP_ERROR_NO_BITMAP_INFO; } -void RegisterlibSceDiscMap(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("fl1eoDnwQ4s", "libSceDiscMap", 1, "libSceDiscMap", 1, 1, sceDiscMapGetPackageSize); LIB_FUNCTION("lbQKqsERhtE", "libSceDiscMap", 1, "libSceDiscMap", 1, 1, diff --git a/src/core/libraries/disc_map/disc_map.h b/src/core/libraries/disc_map/disc_map.h index dc8b875ac..df6c25aa0 100644 --- a/src/core/libraries/disc_map/disc_map.h +++ b/src/core/libraries/disc_map/disc_map.h @@ -18,5 +18,5 @@ int PS4_SYSV_ABI Func_8A828CAEE7EDD5E9(char* path, s64 offset, s64 nbytes, int* int* ret2); int PS4_SYSV_ABI Func_E7EBCE96E92F91F8(); -void RegisterlibSceDiscMap(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::DiscMap \ No newline at end of file diff --git a/src/core/libraries/fiber/fiber.cpp b/src/core/libraries/fiber/fiber.cpp index 345f0834d..6810d5854 100644 --- a/src/core/libraries/fiber/fiber.cpp +++ b/src/core/libraries/fiber/fiber.cpp @@ -545,7 +545,7 @@ s32 PS4_SYSV_ABI sceFiberSwitch(OrbisFiber* fiber, u64 arg_on_run_to, u64* arg_o return sceFiberSwitchImpl(fiber, nullptr, 0, arg_on_run_to, arg_on_run); } -void RegisterlibSceFiber(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("hVYD7Ou2pCQ", "libSceFiber", 1, "libSceFiber", 1, 1, sceFiberInitialize); LIB_FUNCTION("7+OJIpko9RY", "libSceFiber", 1, "libSceFiber", 1, 1, sceFiberInitializeImpl); // _sceFiberInitializeWithInternalOptionImpl diff --git a/src/core/libraries/fiber/fiber.h b/src/core/libraries/fiber/fiber.h index edcd9afe8..f52a751b1 100644 --- a/src/core/libraries/fiber/fiber.h +++ b/src/core/libraries/fiber/fiber.h @@ -116,5 +116,5 @@ s32 PS4_SYSV_ABI sceFiberRename(OrbisFiber* fiber, const char* name); s32 PS4_SYSV_ABI sceFiberGetThreadFramePointerAddress(u64* addr_frame_pointer); -void RegisterlibSceFiber(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Fiber \ No newline at end of file diff --git a/src/core/libraries/game_live_streaming/gamelivestreaming.cpp b/src/core/libraries/game_live_streaming/gamelivestreaming.cpp index a1ebddfbf..1457052d2 100644 --- a/src/core/libraries/game_live_streaming/gamelivestreaming.cpp +++ b/src/core/libraries/game_live_streaming/gamelivestreaming.cpp @@ -246,7 +246,7 @@ int PS4_SYSV_ABI sceGameLiveStreamingUnregisterCallback() { return ORBIS_OK; } -void RegisterlibSceGameLiveStreaming(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("caqgDl+V9qA", "libSceGameLiveStreaming_debug", 1, "libSceGameLiveStreaming", 1, 1, sceGameLiveStreamingStartDebugBroadcast); LIB_FUNCTION("0i8Lrllxwow", "libSceGameLiveStreaming_debug", 1, "libSceGameLiveStreaming", 1, 1, diff --git a/src/core/libraries/game_live_streaming/gamelivestreaming.h b/src/core/libraries/game_live_streaming/gamelivestreaming.h index 468750fd1..0bab969bd 100644 --- a/src/core/libraries/game_live_streaming/gamelivestreaming.h +++ b/src/core/libraries/game_live_streaming/gamelivestreaming.h @@ -77,5 +77,5 @@ int PS4_SYSV_ABI sceGameLiveStreamingStopSocialFeedbackMessageFiltering(); int PS4_SYSV_ABI sceGameLiveStreamingTerminate(); int PS4_SYSV_ABI sceGameLiveStreamingUnregisterCallback(); -void RegisterlibSceGameLiveStreaming(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::GameLiveStreaming \ No newline at end of file diff --git a/src/core/libraries/gnmdriver/gnmdriver.cpp b/src/core/libraries/gnmdriver/gnmdriver.cpp index 8c3ab1612..a8860888b 100644 --- a/src/core/libraries/gnmdriver/gnmdriver.cpp +++ b/src/core/libraries/gnmdriver/gnmdriver.cpp @@ -2823,7 +2823,7 @@ int PS4_SYSV_ABI Func_F916890425496553() { return ORBIS_OK; } -void RegisterlibSceGnmDriver(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LOG_INFO(Lib_GnmDriver, "Initializing presenter"); liverpool = std::make_unique(); presenter = std::make_unique(*g_window, liverpool.get()); diff --git a/src/core/libraries/gnmdriver/gnmdriver.h b/src/core/libraries/gnmdriver/gnmdriver.h index a3d4968d3..0f804a91f 100644 --- a/src/core/libraries/gnmdriver/gnmdriver.h +++ b/src/core/libraries/gnmdriver/gnmdriver.h @@ -297,5 +297,5 @@ int PS4_SYSV_ABI Func_BFB41C057478F0BF(); int PS4_SYSV_ABI Func_E51D44DB8151238C(); int PS4_SYSV_ABI Func_F916890425496553(); -void RegisterlibSceGnmDriver(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::GnmDriver diff --git a/src/core/libraries/hmd/hmd.cpp b/src/core/libraries/hmd/hmd.cpp index b43789822..43c9cb5d5 100644 --- a/src/core/libraries/hmd/hmd.cpp +++ b/src/core/libraries/hmd/hmd.cpp @@ -939,7 +939,7 @@ s32 PS4_SYSV_ABI Func_FF2E0E53015FE231() { return ORBIS_OK; } -void RegisterlibSceHmd(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("8gH1aLgty5I", "libsceHmdReprojectionMultilayer", 1, "libSceHmd", 1, 1, sceHmdReprojectionStartMultilayer); LIB_FUNCTION("gEokC+OGI8g", "libSceHmdDistortion", 1, "libSceHmd", 1, 1, diff --git a/src/core/libraries/hmd/hmd.h b/src/core/libraries/hmd/hmd.h index 12f1ac70a..1f1455989 100644 --- a/src/core/libraries/hmd/hmd.h +++ b/src/core/libraries/hmd/hmd.h @@ -199,5 +199,5 @@ s32 PS4_SYSV_ABI Func_B9A6FA0735EC7E49(); s32 PS4_SYSV_ABI Func_FC193BD653F2AF2E(); s32 PS4_SYSV_ABI Func_FF2E0E53015FE231(); -void RegisterlibSceHmd(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Hmd \ No newline at end of file diff --git a/src/core/libraries/ime/error_dialog.cpp b/src/core/libraries/ime/error_dialog.cpp index 07580fe1d..c4fc18381 100644 --- a/src/core/libraries/ime/error_dialog.cpp +++ b/src/core/libraries/ime/error_dialog.cpp @@ -190,7 +190,7 @@ Status PS4_SYSV_ABI sceErrorDialogUpdateStatus() { return g_status; } -void RegisterlibSceErrorDialog(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("ekXHb1kDBl0", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1, sceErrorDialogClose); LIB_FUNCTION("t2FvHRXzgqk", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1, diff --git a/src/core/libraries/ime/error_dialog.h b/src/core/libraries/ime/error_dialog.h index 3e6651d4a..75643b1db 100644 --- a/src/core/libraries/ime/error_dialog.h +++ b/src/core/libraries/ime/error_dialog.h @@ -24,5 +24,5 @@ int PS4_SYSV_ABI sceErrorDialogOpenWithReport(); CommonDialog::Error PS4_SYSV_ABI sceErrorDialogTerminate(); CommonDialog::Status PS4_SYSV_ABI sceErrorDialogUpdateStatus(); -void RegisterlibSceErrorDialog(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::ErrorDialog \ No newline at end of file diff --git a/src/core/libraries/ime/ime.cpp b/src/core/libraries/ime/ime.cpp index 54e856e87..dc87e486d 100644 --- a/src/core/libraries/ime/ime.cpp +++ b/src/core/libraries/ime/ime.cpp @@ -481,7 +481,7 @@ int PS4_SYSV_ABI sceImeVshUpdateContext2() { return ORBIS_OK; } -void RegisterlibSceIme(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("mN+ZoSN-8hQ", "libSceIme", 1, "libSceIme", 1, 1, FinalizeImeModule); LIB_FUNCTION("uTW+63goeJs", "libSceIme", 1, "libSceIme", 1, 1, InitializeImeModule); LIB_FUNCTION("Lf3DeGWC6xg", "libSceIme", 1, "libSceIme", 1, 1, sceImeCheckFilterText); diff --git a/src/core/libraries/ime/ime.h b/src/core/libraries/ime/ime.h index c2b80809c..6691965b8 100644 --- a/src/core/libraries/ime/ime.h +++ b/src/core/libraries/ime/ime.h @@ -68,6 +68,6 @@ int PS4_SYSV_ABI sceImeVshUpdate(); int PS4_SYSV_ABI sceImeVshUpdateContext(); int PS4_SYSV_ABI sceImeVshUpdateContext2(); -void RegisterlibSceIme(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Ime diff --git a/src/core/libraries/ime/ime_dialog.cpp b/src/core/libraries/ime/ime_dialog.cpp index 6f808636b..21bb47bfc 100644 --- a/src/core/libraries/ime/ime_dialog.cpp +++ b/src/core/libraries/ime/ime_dialog.cpp @@ -280,7 +280,7 @@ Error PS4_SYSV_ABI sceImeDialogTerm() { return Error::OK; } -void RegisterlibSceImeDialog(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("oBmw4xrmfKs", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, sceImeDialogAbort); LIB_FUNCTION("bX4H+sxPI-o", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, sceImeDialogForceClose); diff --git a/src/core/libraries/ime/ime_dialog.h b/src/core/libraries/ime/ime_dialog.h index a056fdd5e..569bdf3c0 100644 --- a/src/core/libraries/ime/ime_dialog.h +++ b/src/core/libraries/ime/ime_dialog.h @@ -47,5 +47,5 @@ int PS4_SYSV_ABI sceImeDialogInitInternal3(); int PS4_SYSV_ABI sceImeDialogSetPanelPosition(); Error PS4_SYSV_ABI sceImeDialogTerm(); -void RegisterlibSceImeDialog(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::ImeDialog diff --git a/src/core/libraries/jpeg/jpegenc.cpp b/src/core/libraries/jpeg/jpegenc.cpp index b9c88d094..537efec97 100644 --- a/src/core/libraries/jpeg/jpegenc.cpp +++ b/src/core/libraries/jpeg/jpegenc.cpp @@ -197,7 +197,7 @@ s32 PS4_SYSV_ABI sceJpegEncQueryMemorySize(const OrbisJpegEncCreateParam* param) return ORBIS_JPEG_ENC_MINIMUM_MEMORY_SIZE; } -void RegisterlibSceJpegEnc(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("K+rocojkr-I", "libSceJpegEnc", 1, "libSceJpegEnc", 1, 1, sceJpegEncCreate); LIB_FUNCTION("j1LyMdaM+C0", "libSceJpegEnc", 1, "libSceJpegEnc", 1, 1, sceJpegEncDelete); LIB_FUNCTION("QbrU0cUghEM", "libSceJpegEnc", 1, "libSceJpegEnc", 1, 1, sceJpegEncEncode); diff --git a/src/core/libraries/jpeg/jpegenc.h b/src/core/libraries/jpeg/jpegenc.h index a6b4d311a..e0c39c58d 100644 --- a/src/core/libraries/jpeg/jpegenc.h +++ b/src/core/libraries/jpeg/jpegenc.h @@ -80,5 +80,5 @@ s32 PS4_SYSV_ABI sceJpegEncEncode(OrbisJpegEncHandle handle, const OrbisJpegEncE OrbisJpegEncOutputInfo* output_info); s32 PS4_SYSV_ABI sceJpegEncQueryMemorySize(const OrbisJpegEncCreateParam* param); -void RegisterlibSceJpegEnc(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::JpegEnc diff --git a/src/core/libraries/kernel/file_system.cpp b/src/core/libraries/kernel/file_system.cpp index 76d1a3339..9dd70afc6 100644 --- a/src/core/libraries/kernel/file_system.cpp +++ b/src/core/libraries/kernel/file_system.cpp @@ -118,14 +118,16 @@ s32 PS4_SYSV_ABI open(const char* raw_path, s32 flags, u16 mode) { return -1; } - if (read_only) { - // Can't create files in a read only directory - h->DeleteHandle(handle); - *__Error() = POSIX_EROFS; - return -1; + if (!exists) { + if (read_only) { + // Can't create files in a read only directory + h->DeleteHandle(handle); + *__Error() = POSIX_EROFS; + return -1; + } + // Create a file if it doesn't exist + Common::FS::IOFile out(file->m_host_name, Common::FS::FileAccessMode::Write); } - // Create a file if it doesn't exist - Common::FS::IOFile out(file->m_host_name, Common::FS::FileAccessMode::Write); } else if (!exists) { // If we're not creating a file, and it doesn't exist, return ENOENT h->DeleteHandle(handle); diff --git a/src/core/libraries/kernel/kernel.cpp b/src/core/libraries/kernel/kernel.cpp index a4d3accac..3272e8727 100644 --- a/src/core/libraries/kernel/kernel.cpp +++ b/src/core/libraries/kernel/kernel.cpp @@ -257,7 +257,7 @@ s32 PS4_SYSV_ABI sceKernelGetSystemSwVersion(SwVersionStruct* ret) { return ORBIS_OK; } -void RegisterKernel(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { service_thread = std::jthread{KernelServiceThread}; Libraries::Kernel::RegisterFileSystem(sym); diff --git a/src/core/libraries/kernel/kernel.h b/src/core/libraries/kernel/kernel.h index 018759e14..212471ccb 100644 --- a/src/core/libraries/kernel/kernel.h +++ b/src/core/libraries/kernel/kernel.h @@ -41,6 +41,6 @@ struct SwVersionStruct { u32 hex_representation; }; -void RegisterKernel(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Kernel diff --git a/src/core/libraries/libpng/pngdec.cpp b/src/core/libraries/libpng/pngdec.cpp index d9a324fc5..7ff12473d 100644 --- a/src/core/libraries/libpng/pngdec.cpp +++ b/src/core/libraries/libpng/pngdec.cpp @@ -261,7 +261,7 @@ s32 PS4_SYSV_ABI scePngDecQueryMemorySize(const OrbisPngDecCreateParam* param) { return sizeof(PngHandler); } -void RegisterlibScePngDec(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("m0uW+8pFyaw", "libScePngDec", 1, "libScePngDec", 1, 1, scePngDecCreate); LIB_FUNCTION("WC216DD3El4", "libScePngDec", 1, "libScePngDec", 1, 1, scePngDecDecode); LIB_FUNCTION("cJ--1xAbj-I", "libScePngDec", 1, "libScePngDec", 1, 1, diff --git a/src/core/libraries/libpng/pngdec.h b/src/core/libraries/libpng/pngdec.h index c897d7c95..b306d6100 100644 --- a/src/core/libraries/libpng/pngdec.h +++ b/src/core/libraries/libpng/pngdec.h @@ -79,5 +79,5 @@ s32 PS4_SYSV_ABI scePngDecParseHeader(const OrbisPngDecParseParam* param, OrbisPngDecImageInfo* imageInfo); s32 PS4_SYSV_ABI scePngDecQueryMemorySize(const OrbisPngDecCreateParam* param); -void RegisterlibScePngDec(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::PngDec diff --git a/src/core/libraries/libs.cpp b/src/core/libraries/libs.cpp index 762c1e762..af9328a57 100644 --- a/src/core/libraries/libs.cpp +++ b/src/core/libraries/libs.cpp @@ -70,66 +70,66 @@ namespace Libraries { void InitHLELibs(Core::Loader::SymbolsResolver* sym) { LOG_INFO(Lib_Kernel, "Initializing HLE libraries"); - Libraries::Kernel::RegisterKernel(sym); - Libraries::GnmDriver::RegisterlibSceGnmDriver(sym); + Libraries::Kernel::RegisterLib(sym); + Libraries::GnmDriver::RegisterLib(sym); Libraries::VideoOut::RegisterLib(sym); - Libraries::UserService::RegisterlibSceUserService(sym); - Libraries::SystemService::RegisterlibSceSystemService(sym); - Libraries::CommonDialog::RegisterlibSceCommonDialog(sym); - Libraries::MsgDialog::RegisterlibSceMsgDialog(sym); - Libraries::AudioOut::RegisterlibSceAudioOut(sym); - Libraries::Http::RegisterlibSceHttp(sym); - Libraries::Http2::RegisterlibSceHttp2(sym); - Libraries::Net::RegisterlibSceNet(sym); - Libraries::NetCtl::RegisterlibSceNetCtl(sym); - Libraries::SaveData::RegisterlibSceSaveData(sym); - Libraries::SaveData::Dialog::RegisterlibSceSaveDataDialog(sym); - Libraries::Ssl::RegisterlibSceSsl(sym); - Libraries::Ssl2::RegisterlibSceSsl2(sym); - Libraries::SysModule::RegisterlibSceSysmodule(sym); - Libraries::Posix::Registerlibsceposix(sym); - Libraries::AudioIn::RegisterlibSceAudioIn(sym); - Libraries::NpCommon::RegisterlibSceNpCommon(sym); - Libraries::NpManager::RegisterlibSceNpManager(sym); - Libraries::NpScore::RegisterlibSceNpScore(sym); - Libraries::NpTrophy::RegisterlibSceNpTrophy(sym); - Libraries::NpWebApi::RegisterlibSceNpWebApi(sym); - Libraries::NpAuth::RegisterlibSceNpAuth(sym); - Libraries::ScreenShot::RegisterlibSceScreenShot(sym); - Libraries::AppContent::RegisterlibSceAppContent(sym); - Libraries::PngDec::RegisterlibScePngDec(sym); - Libraries::PlayGo::RegisterlibScePlayGo(sym); - Libraries::PlayGo::Dialog::RegisterlibScePlayGoDialog(sym); - Libraries::Random::RegisterlibSceRandom(sym); - Libraries::Usbd::RegisterlibSceUsbd(sym); - Libraries::Pad::RegisterlibScePad(sym); - Libraries::Ajm::RegisterlibSceAjm(sym); - Libraries::ErrorDialog::RegisterlibSceErrorDialog(sym); - Libraries::ImeDialog::RegisterlibSceImeDialog(sym); - Libraries::AvPlayer::RegisterlibSceAvPlayer(sym); - Libraries::Vdec2::RegisterlibSceVdec2(sym); - Libraries::Audio3d::RegisterlibSceAudio3d(sym); - Libraries::Ime::RegisterlibSceIme(sym); - Libraries::GameLiveStreaming::RegisterlibSceGameLiveStreaming(sym); - Libraries::SharePlay::RegisterlibSceSharePlay(sym); - Libraries::Remoteplay::RegisterlibSceRemoteplay(sym); - Libraries::Videodec::RegisterlibSceVideodec(sym); - Libraries::RazorCpu::RegisterlibSceRazorCpu(sym); - Libraries::Move::RegisterlibSceMove(sym); - Libraries::Fiber::RegisterlibSceFiber(sym); - Libraries::JpegEnc::RegisterlibSceJpegEnc(sym); - Libraries::Mouse::RegisterlibSceMouse(sym); - Libraries::WebBrowserDialog::RegisterlibSceWebBrowserDialog(sym); - Libraries::NpParty::RegisterlibSceNpParty(sym); - Libraries::Zlib::RegisterlibSceZlib(sym); - Libraries::Hmd::RegisterlibSceHmd(sym); - Libraries::DiscMap::RegisterlibSceDiscMap(sym); - Libraries::Ulobjmgr::RegisterlibSceUlobjmgr(sym); - Libraries::SigninDialog::RegisterlibSceSigninDialog(sym); - Libraries::Camera::RegisterlibSceCamera(sym); - Libraries::CompanionHttpd::RegisterlibSceCompanionHttpd(sym); - Libraries::CompanionUtil::RegisterlibSceCompanionUtil(sym); - Libraries::Voice::RegisterlibSceVoice(sym); + Libraries::UserService::RegisterLib(sym); + Libraries::SystemService::RegisterLib(sym); + Libraries::CommonDialog::RegisterLib(sym); + Libraries::MsgDialog::RegisterLib(sym); + Libraries::AudioOut::RegisterLib(sym); + Libraries::Http::RegisterLib(sym); + Libraries::Http2::RegisterLib(sym); + Libraries::Net::RegisterLib(sym); + Libraries::NetCtl::RegisterLib(sym); + Libraries::SaveData::RegisterLib(sym); + Libraries::SaveData::Dialog::RegisterLib(sym); + Libraries::Ssl::RegisterLib(sym); + Libraries::Ssl2::RegisterLib(sym); + Libraries::SysModule::RegisterLib(sym); + Libraries::Posix::RegisterLib(sym); + Libraries::AudioIn::RegisterLib(sym); + Libraries::NpCommon::RegisterLib(sym); + Libraries::NpManager::RegisterLib(sym); + Libraries::NpScore::RegisterLib(sym); + Libraries::NpTrophy::RegisterLib(sym); + Libraries::NpWebApi::RegisterLib(sym); + Libraries::NpAuth::RegisterLib(sym); + Libraries::ScreenShot::RegisterLib(sym); + Libraries::AppContent::RegisterLib(sym); + Libraries::PngDec::RegisterLib(sym); + Libraries::PlayGo::RegisterLib(sym); + Libraries::PlayGo::Dialog::RegisterLib(sym); + Libraries::Random::RegisterLib(sym); + Libraries::Usbd::RegisterLib(sym); + Libraries::Pad::RegisterLib(sym); + Libraries::Ajm::RegisterLib(sym); + Libraries::ErrorDialog::RegisterLib(sym); + Libraries::ImeDialog::RegisterLib(sym); + Libraries::AvPlayer::RegisterLib(sym); + Libraries::Vdec2::RegisterLib(sym); + Libraries::Audio3d::RegisterLib(sym); + Libraries::Ime::RegisterLib(sym); + Libraries::GameLiveStreaming::RegisterLib(sym); + Libraries::SharePlay::RegisterLib(sym); + Libraries::Remoteplay::RegisterLib(sym); + Libraries::Videodec::RegisterLib(sym); + Libraries::RazorCpu::RegisterLib(sym); + Libraries::Move::RegisterLib(sym); + Libraries::Fiber::RegisterLib(sym); + Libraries::JpegEnc::RegisterLib(sym); + Libraries::Mouse::RegisterLib(sym); + Libraries::WebBrowserDialog::RegisterLib(sym); + Libraries::NpParty::RegisterLib(sym); + Libraries::Zlib::RegisterLib(sym); + Libraries::Hmd::RegisterLib(sym); + Libraries::DiscMap::RegisterLib(sym); + Libraries::Ulobjmgr::RegisterLib(sym); + Libraries::SigninDialog::RegisterLib(sym); + Libraries::Camera::RegisterLib(sym); + Libraries::CompanionHttpd::RegisterLib(sym); + Libraries::CompanionUtil::RegisterLib(sym); + Libraries::Voice::RegisterLib(sym); } } // namespace Libraries diff --git a/src/core/libraries/mouse/mouse.cpp b/src/core/libraries/mouse/mouse.cpp index dffd2346c..d9bd2669f 100644 --- a/src/core/libraries/mouse/mouse.cpp +++ b/src/core/libraries/mouse/mouse.cpp @@ -79,7 +79,7 @@ int PS4_SYSV_ABI sceMouseSetProcessPrivilege() { return ORBIS_OK; } -void RegisterlibSceMouse(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("cAnT0Rw-IwU", "libSceMouse", 1, "libSceMouse", 1, 1, sceMouseClose); LIB_FUNCTION("Ymyy1HSSJLQ", "libSceMouse", 1, "libSceMouse", 1, 1, sceMouseConnectPort); LIB_FUNCTION("BRXOoXQtb+k", "libSceMouse", 1, "libSceMouse", 1, 1, sceMouseDebugGetDeviceId); diff --git a/src/core/libraries/mouse/mouse.h b/src/core/libraries/mouse/mouse.h index 8264f62e0..192343434 100644 --- a/src/core/libraries/mouse/mouse.h +++ b/src/core/libraries/mouse/mouse.h @@ -25,5 +25,5 @@ int PS4_SYSV_ABI sceMouseSetHandType(); int PS4_SYSV_ABI sceMouseSetPointerSpeed(); int PS4_SYSV_ABI sceMouseSetProcessPrivilege(); -void RegisterlibSceMouse(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Mouse \ No newline at end of file diff --git a/src/core/libraries/move/move.cpp b/src/core/libraries/move/move.cpp index 500d89586..f63142615 100644 --- a/src/core/libraries/move/move.cpp +++ b/src/core/libraries/move/move.cpp @@ -38,7 +38,7 @@ int PS4_SYSV_ABI sceMoveInit() { return ORBIS_OK; } -void RegisterlibSceMove(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("HzC60MfjJxU", "libSceMove", 1, "libSceMove", 1, 1, sceMoveOpen); LIB_FUNCTION("GWXTyxs4QbE", "libSceMove", 1, "libSceMove", 1, 1, sceMoveGetDeviceInfo); LIB_FUNCTION("ttU+JOhShl4", "libSceMove", 1, "libSceMove", 1, 1, sceMoveReadStateLatest); diff --git a/src/core/libraries/move/move.h b/src/core/libraries/move/move.h index 2d7adaba7..8ae6c545c 100644 --- a/src/core/libraries/move/move.h +++ b/src/core/libraries/move/move.h @@ -17,5 +17,5 @@ int PS4_SYSV_ABI sceMoveReadStateRecent(); int PS4_SYSV_ABI sceMoveTerm(); int PS4_SYSV_ABI sceMoveInit(); -void RegisterlibSceMove(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Move \ No newline at end of file diff --git a/src/core/libraries/network/http.cpp b/src/core/libraries/network/http.cpp index dbb5b096a..f7cbed931 100644 --- a/src/core/libraries/network/http.cpp +++ b/src/core/libraries/network/http.cpp @@ -847,7 +847,7 @@ int PS4_SYSV_ABI sceHttpWaitRequest() { return ORBIS_OK; } -void RegisterlibSceHttp(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("hvG6GfBMXg8", "libSceHttp", 1, "libSceHttp", 1, 1, sceHttpAbortRequest); LIB_FUNCTION("JKl06ZIAl6A", "libSceHttp", 1, "libSceHttp", 1, 1, sceHttpAbortRequestForce); LIB_FUNCTION("sWQiqKvYTVA", "libSceHttp", 1, "libSceHttp", 1, 1, sceHttpAbortWaitRequest); diff --git a/src/core/libraries/network/http.h b/src/core/libraries/network/http.h index c687c60c4..cc9ca57af 100644 --- a/src/core/libraries/network/http.h +++ b/src/core/libraries/network/http.h @@ -141,5 +141,5 @@ int PS4_SYSV_ABI sceHttpUriSweepPath(char* dst, const char* src, size_t srcSize) int PS4_SYSV_ABI sceHttpUriUnescape(char* out, size_t* require, size_t prepare, const char* in); int PS4_SYSV_ABI sceHttpWaitRequest(); -void RegisterlibSceHttp(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Http diff --git a/src/core/libraries/network/http2.cpp b/src/core/libraries/network/http2.cpp index 52f73edc6..f6a0eba4e 100644 --- a/src/core/libraries/network/http2.cpp +++ b/src/core/libraries/network/http2.cpp @@ -289,7 +289,7 @@ int PS4_SYSV_ABI sceHttp2WaitAsync() { return ORBIS_OK; } -void RegisterlibSceHttp2(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("AS45QoYHjc4", "libSceHttp2", 1, "libSceHttp2", 1, 1, _Z5dummyv); LIB_FUNCTION("IZ-qjhRqvjk", "libSceHttp2", 1, "libSceHttp2", 1, 1, sceHttp2AbortRequest); LIB_FUNCTION("flPxnowtvWY", "libSceHttp2", 1, "libSceHttp2", 1, 1, sceHttp2AddCookie); diff --git a/src/core/libraries/network/http2.h b/src/core/libraries/network/http2.h index aa1d0c5b4..99359518a 100644 --- a/src/core/libraries/network/http2.h +++ b/src/core/libraries/network/http2.h @@ -68,5 +68,5 @@ int PS4_SYSV_ABI sceHttp2SslEnableOption(); int PS4_SYSV_ABI sceHttp2Term(); int PS4_SYSV_ABI sceHttp2WaitAsync(); -void RegisterlibSceHttp2(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Http2 \ No newline at end of file diff --git a/src/core/libraries/network/net.cpp b/src/core/libraries/network/net.cpp index 9607f0d78..6df4f2f40 100644 --- a/src/core/libraries/network/net.cpp +++ b/src/core/libraries/network/net.cpp @@ -1942,7 +1942,7 @@ int PS4_SYSV_ABI sceNetEmulationSet() { return ORBIS_OK; } -void RegisterlibSceNet(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("ZRAJo-A-ukc", "libSceNet", 1, "libSceNet", 1, 1, in6addr_any); LIB_FUNCTION("XCuA-GqjA-k", "libSceNet", 1, "libSceNet", 1, 1, in6addr_loopback); LIB_FUNCTION("VZgoeBxPXUQ", "libSceNet", 1, "libSceNet", 1, 1, sce_net_dummy); diff --git a/src/core/libraries/network/net.h b/src/core/libraries/network/net.h index 1393ecb1d..7b6a5680c 100644 --- a/src/core/libraries/network/net.h +++ b/src/core/libraries/network/net.h @@ -336,5 +336,5 @@ int PS4_SYSV_ABI Func_0E707A589F751C68(); int PS4_SYSV_ABI sceNetEmulationGet(); int PS4_SYSV_ABI sceNetEmulationSet(); -void RegisterlibSceNet(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Net diff --git a/src/core/libraries/network/netctl.cpp b/src/core/libraries/network/netctl.cpp index 38225c48c..54a273dc3 100644 --- a/src/core/libraries/network/netctl.cpp +++ b/src/core/libraries/network/netctl.cpp @@ -547,7 +547,7 @@ int PS4_SYSV_ABI sceNetCtlApRpUnregisterCallback() { return ORBIS_OK; } -void RegisterlibSceNetCtl(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("XtClSOC1xcU", "libSceNetBwe", 1, "libSceNetCtl", 1, 1, sceNetBweCheckCallbackIpcInt); LIB_FUNCTION("YALqoY4aeY0", "libSceNetBwe", 1, "libSceNetCtl", 1, 1, sceNetBweClearEventIpcInt); diff --git a/src/core/libraries/network/netctl.h b/src/core/libraries/network/netctl.h index 203c75822..7f139e8c3 100644 --- a/src/core/libraries/network/netctl.h +++ b/src/core/libraries/network/netctl.h @@ -165,5 +165,5 @@ int PS4_SYSV_ABI sceNetCtlApRpStartWithRetry(); int PS4_SYSV_ABI sceNetCtlApRpStop(); int PS4_SYSV_ABI sceNetCtlApRpUnregisterCallback(); -void RegisterlibSceNetCtl(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::NetCtl diff --git a/src/core/libraries/network/ssl.cpp b/src/core/libraries/network/ssl.cpp index a5ac8f5ef..1e013bc26 100644 --- a/src/core/libraries/network/ssl.cpp +++ b/src/core/libraries/network/ssl.cpp @@ -1050,7 +1050,7 @@ int PS4_SYSV_ABI Func_28F8791A771D39C7() { return ORBIS_OK; } -void RegisterlibSceSsl(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("Pgt0gg14ewU", "libSceSsl", 1, "libSceSsl", 1, 1, CA_MGMT_allocCertDistinguishedName); LIB_FUNCTION("wJ5jCpkCv-c", "libSceSsl", 1, "libSceSsl", 1, 1, diff --git a/src/core/libraries/network/ssl.h b/src/core/libraries/network/ssl.h index fcdcdd166..051c6363e 100644 --- a/src/core/libraries/network/ssl.h +++ b/src/core/libraries/network/ssl.h @@ -220,5 +220,5 @@ int PS4_SYSV_ABI VLONG_freeVlongQueue(); int PS4_SYSV_ABI Func_22E76E60BC0587D7(); int PS4_SYSV_ABI Func_28F8791A771D39C7(); -void RegisterlibSceSsl(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Ssl diff --git a/src/core/libraries/network/ssl2.cpp b/src/core/libraries/network/ssl2.cpp index 8ca29526e..701f091a3 100644 --- a/src/core/libraries/network/ssl2.cpp +++ b/src/core/libraries/network/ssl2.cpp @@ -290,7 +290,7 @@ int PS4_SYSV_ABI Func_28F8791A771D39C7() { return ORBIS_OK; } -void RegisterlibSceSsl2(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("Md+HYkCBZB4", "libSceSsl", 1, "libSceSsl", 2, 1, CA_MGMT_extractKeyBlobEx); LIB_FUNCTION("9bKYzKP6kYU", "libSceSsl", 1, "libSceSsl", 2, 1, CA_MGMT_extractPublicKeyInfo); LIB_FUNCTION("ipLIammTj2Q", "libSceSsl", 1, "libSceSsl", 2, 1, CA_MGMT_freeKeyBlob); diff --git a/src/core/libraries/network/ssl2.h b/src/core/libraries/network/ssl2.h index 03ee3b86e..754dda40c 100644 --- a/src/core/libraries/network/ssl2.h +++ b/src/core/libraries/network/ssl2.h @@ -10,5 +10,5 @@ class SymbolsResolver; } namespace Libraries::Ssl2 { -void RegisterlibSceSsl2(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Ssl2 \ No newline at end of file diff --git a/src/core/libraries/np_auth/np_auth.cpp b/src/core/libraries/np_auth/np_auth.cpp index 9ec986f3c..90f249c97 100644 --- a/src/core/libraries/np_auth/np_auth.cpp +++ b/src/core/libraries/np_auth/np_auth.cpp @@ -73,7 +73,7 @@ s32 PS4_SYSV_ABI sceNpAuthWaitAsync() { return ORBIS_OK; } -void RegisterlibSceNpAuth(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("KxGkOrQJTqY", "libSceNpAuthCompat", 1, "libSceNpAuth", 1, 1, sceNpAuthGetAuthorizationCode); LIB_FUNCTION("uaB-LoJqHis", "libSceNpAuthCompat", 1, "libSceNpAuth", 1, 1, sceNpAuthGetIdToken); diff --git a/src/core/libraries/np_auth/np_auth.h b/src/core/libraries/np_auth/np_auth.h index a6a66b452..17f293865 100644 --- a/src/core/libraries/np_auth/np_auth.h +++ b/src/core/libraries/np_auth/np_auth.h @@ -25,5 +25,5 @@ s32 PS4_SYSV_ABI sceNpAuthPollAsync(); s32 PS4_SYSV_ABI sceNpAuthSetTimeout(); s32 PS4_SYSV_ABI sceNpAuthWaitAsync(); -void RegisterlibSceNpAuth(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::NpAuth \ No newline at end of file diff --git a/src/core/libraries/np_common/np_common.cpp b/src/core/libraries/np_common/np_common.cpp index 1234705cc..4c68fbf7a 100644 --- a/src/core/libraries/np_common/np_common.cpp +++ b/src/core/libraries/np_common/np_common.cpp @@ -6129,7 +6129,7 @@ int PS4_SYSV_ABI Func_FFF4A3E279FB44A7() { return ORBIS_OK; } -void RegisterlibSceNpCommon(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("i8UmXTSq7N4", "libSceNpCommonCompat", 1, "libSceNpCommon", 1, 1, sceNpCmpNpId); LIB_FUNCTION("TcwEFnakiSc", "libSceNpCommonCompat", 1, "libSceNpCommon", 1, 1, sceNpCmpNpIdInOrder); diff --git a/src/core/libraries/np_common/np_common.h b/src/core/libraries/np_common/np_common.h index 886610ccc..2ef3f5e69 100644 --- a/src/core/libraries/np_common/np_common.h +++ b/src/core/libraries/np_common/np_common.h @@ -1241,5 +1241,5 @@ int PS4_SYSV_ABI Func_FE55EE32098D0D58(); int PS4_SYSV_ABI Func_FE79841022E1DA1C(); int PS4_SYSV_ABI Func_FFF4A3E279FB44A7(); -void RegisterlibSceNpCommon(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::NpCommon \ No newline at end of file diff --git a/src/core/libraries/np_manager/np_manager.cpp b/src/core/libraries/np_manager/np_manager.cpp index bc920b5a9..b161a5a50 100644 --- a/src/core/libraries/np_manager/np_manager.cpp +++ b/src/core/libraries/np_manager/np_manager.cpp @@ -2563,7 +2563,7 @@ int PS4_SYSV_ABI sceNpUnregisterStateCallbackForToolkit() { return ORBIS_OK; } -void RegisterlibSceNpManager(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("70N4VzVCpQg", "libSceNpManagerForSys", 1, "libSceNpManager", 1, 1, Func_EF4378573542A508); LIB_FUNCTION("pHLjntY0psg", "libSceNpManager", 1, "libSceNpManager", 1, 1, diff --git a/src/core/libraries/np_manager/np_manager.h b/src/core/libraries/np_manager/np_manager.h index 1078a9f3e..261e40208 100644 --- a/src/core/libraries/np_manager/np_manager.h +++ b/src/core/libraries/np_manager/np_manager.h @@ -542,5 +542,5 @@ int PS4_SYSV_ABI sceNpRegisterStateCallbackForToolkit(OrbisNpStateCallbackForNpT void* userdata); int PS4_SYSV_ABI sceNpUnregisterStateCallbackForToolkit(); -void RegisterlibSceNpManager(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::NpManager diff --git a/src/core/libraries/np_party/np_party.cpp b/src/core/libraries/np_party/np_party.cpp index 8a66ccb22..bd04e64d4 100644 --- a/src/core/libraries/np_party/np_party.cpp +++ b/src/core/libraries/np_party/np_party.cpp @@ -138,7 +138,7 @@ s32 PS4_SYSV_ABI sceNpPartyUnregisterPrivateHandler() { return ORBIS_OK; } -void RegisterlibSceNpParty(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("3e4k2mzLkmc", "libSceNpParty", 1, "libSceNpParty", 1, 1, sceNpPartyCheckCallback); LIB_FUNCTION("nOZRy-slBoA", "libSceNpParty", 1, "libSceNpParty", 1, 1, sceNpPartyCreate); LIB_FUNCTION("XQSUbbnpPBA", "libSceNpParty", 1, "libSceNpParty", 1, 1, sceNpPartyCreateA); diff --git a/src/core/libraries/np_party/np_party.h b/src/core/libraries/np_party/np_party.h index d5f20e4f8..ace565d46 100644 --- a/src/core/libraries/np_party/np_party.h +++ b/src/core/libraries/np_party/np_party.h @@ -40,5 +40,5 @@ s32 PS4_SYSV_ABI sceNpPartyUnregisterPrivateHandler(); s32 PS4_SYSV_ABI module_start(); s32 PS4_SYSV_ABI module_stop(); -void RegisterlibSceNpParty(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::NpParty \ No newline at end of file diff --git a/src/core/libraries/np_score/np_score.cpp b/src/core/libraries/np_score/np_score.cpp index dc16e12d2..e34c872e7 100644 --- a/src/core/libraries/np_score/np_score.cpp +++ b/src/core/libraries/np_score/np_score.cpp @@ -263,7 +263,7 @@ int PS4_SYSV_ABI sceNpScoreWaitAsync() { return ORBIS_OK; } -void RegisterlibSceNpScore(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("1i7kmKbX6hk", "libSceNpScore", 1, "libSceNpScore", 1, 1, sceNpScoreAbortRequest); LIB_FUNCTION("2b3TI0mDYiI", "libSceNpScore", 1, "libSceNpScore", 1, 1, sceNpScoreCensorComment); LIB_FUNCTION("4eOvDyN-aZc", "libSceNpScore", 1, "libSceNpScore", 1, 1, diff --git a/src/core/libraries/np_score/np_score.h b/src/core/libraries/np_score/np_score.h index 3d991efbd..1429075b4 100644 --- a/src/core/libraries/np_score/np_score.h +++ b/src/core/libraries/np_score/np_score.h @@ -63,5 +63,5 @@ int PS4_SYSV_ABI sceNpScoreSetThreadParam(); int PS4_SYSV_ABI sceNpScoreSetTimeout(); int PS4_SYSV_ABI sceNpScoreWaitAsync(); -void RegisterlibSceNpScore(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::NpScore \ No newline at end of file diff --git a/src/core/libraries/np_trophy/np_trophy.cpp b/src/core/libraries/np_trophy/np_trophy.cpp index c0642f81c..ed48bb670 100644 --- a/src/core/libraries/np_trophy/np_trophy.cpp +++ b/src/core/libraries/np_trophy/np_trophy.cpp @@ -1023,7 +1023,7 @@ int PS4_SYSV_ABI Func_FA7A2DD770447552() { return ORBIS_OK; } -void RegisterlibSceNpTrophy(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("aTnHs7W-9Uk", "libSceNpTrophy", 1, "libSceNpTrophy", 1, 1, sceNpTrophyAbortHandle); LIB_FUNCTION("cqGkYAN-gRw", "libSceNpTrophy", 1, "libSceNpTrophy", 1, 1, diff --git a/src/core/libraries/np_trophy/np_trophy.h b/src/core/libraries/np_trophy/np_trophy.h index 9abc795bc..1d200242d 100644 --- a/src/core/libraries/np_trophy/np_trophy.h +++ b/src/core/libraries/np_trophy/np_trophy.h @@ -225,5 +225,5 @@ int PS4_SYSV_ABI Func_9F80071876FFA5F6(); int PS4_SYSV_ABI Func_F8EF6F5350A91990(); int PS4_SYSV_ABI Func_FA7A2DD770447552(); -void RegisterlibSceNpTrophy(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::NpTrophy \ No newline at end of file diff --git a/src/core/libraries/np_web_api/np_web_api.cpp b/src/core/libraries/np_web_api/np_web_api.cpp index 8a7979978..a7c0cdc62 100644 --- a/src/core/libraries/np_web_api/np_web_api.cpp +++ b/src/core/libraries/np_web_api/np_web_api.cpp @@ -509,7 +509,7 @@ s32 PS4_SYSV_ABI Func_F9A32E8685627436() { return ORBIS_OK; } -void RegisterlibSceNpWebApi(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("x1Y7yiYSk7c", "libSceNpWebApiCompat", 1, "libSceNpWebApi", 1, 1, sceNpWebApiCreateContext); LIB_FUNCTION("y5Ta5JCzQHY", "libSceNpWebApiCompat", 1, "libSceNpWebApi", 1, 1, diff --git a/src/core/libraries/np_web_api/np_web_api.h b/src/core/libraries/np_web_api/np_web_api.h index cc007394f..bb3bcbb60 100644 --- a/src/core/libraries/np_web_api/np_web_api.h +++ b/src/core/libraries/np_web_api/np_web_api.h @@ -112,5 +112,5 @@ s32 PS4_SYSV_ABI Func_E324765D18EE4D12(); s32 PS4_SYSV_ABI Func_E789F980D907B653(); s32 PS4_SYSV_ABI Func_F9A32E8685627436(); -void RegisterlibSceNpWebApi(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::NpWebApi \ No newline at end of file diff --git a/src/core/libraries/pad/pad.cpp b/src/core/libraries/pad/pad.cpp index 59964fa58..4aeaeb911 100644 --- a/src/core/libraries/pad/pad.cpp +++ b/src/core/libraries/pad/pad.cpp @@ -761,7 +761,7 @@ int PS4_SYSV_ABI Func_EF103E845B6F0420() { return ORBIS_OK; } -void RegisterlibScePad(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("6ncge5+l5Qs", "libScePad", 1, "libScePad", 1, 1, scePadClose); LIB_FUNCTION("kazv1NzSB8c", "libScePad", 1, "libScePad", 1, 1, scePadConnectPort); LIB_FUNCTION("AcslpN1jHR8", "libScePad", 1, "libScePad", 1, 1, diff --git a/src/core/libraries/pad/pad.h b/src/core/libraries/pad/pad.h index 68943b460..ca6e8a73f 100644 --- a/src/core/libraries/pad/pad.h +++ b/src/core/libraries/pad/pad.h @@ -348,5 +348,5 @@ int PS4_SYSV_ABI Func_51E514BCD3A05CA5(); int PS4_SYSV_ABI Func_89C9237E393DA243(); int PS4_SYSV_ABI Func_EF103E845B6F0420(); -void RegisterlibScePad(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Pad diff --git a/src/core/libraries/playgo/playgo.cpp b/src/core/libraries/playgo/playgo.cpp index aec32e139..221d6f109 100644 --- a/src/core/libraries/playgo/playgo.cpp +++ b/src/core/libraries/playgo/playgo.cpp @@ -385,7 +385,7 @@ s32 PS4_SYSV_ABI scePlayGoTerminate() { return ORBIS_OK; } -void RegisterlibScePlayGo(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("uEqMfMITvEI", "libSceDbgPlayGo", 1, "libScePlayGo", 1, 0, sceDbgPlayGoRequestNextChunk); LIB_FUNCTION("vU+FqrH+pEY", "libSceDbgPlayGo", 1, "libScePlayGo", 1, 0, sceDbgPlayGoSnapshot); diff --git a/src/core/libraries/playgo/playgo.h b/src/core/libraries/playgo/playgo.h index 2338c9ebf..68a5f1e84 100644 --- a/src/core/libraries/playgo/playgo.h +++ b/src/core/libraries/playgo/playgo.h @@ -41,5 +41,5 @@ s32 PS4_SYSV_ABI scePlayGoSetToDoList(OrbisPlayGoHandle handle, const OrbisPlayG uint32_t numberOfEntries); s32 PS4_SYSV_ABI scePlayGoTerminate(); -void RegisterlibScePlayGo(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::PlayGo \ No newline at end of file diff --git a/src/core/libraries/playgo/playgo_dialog.cpp b/src/core/libraries/playgo/playgo_dialog.cpp index 16f7aa05d..be9a65f1a 100644 --- a/src/core/libraries/playgo/playgo_dialog.cpp +++ b/src/core/libraries/playgo/playgo_dialog.cpp @@ -58,7 +58,7 @@ Status PS4_SYSV_ABI scePlayGoDialogUpdateStatus() { return Status::FINISHED; } -void RegisterlibScePlayGoDialog(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("fbigNQiZpm0", "libScePlayGoDialog", 1, "libScePlayGoDialog", 1, 1, scePlayGoDialogClose); LIB_FUNCTION("wx9TDplJKB4", "libScePlayGoDialog", 1, "libScePlayGoDialog", 1, 1, diff --git a/src/core/libraries/playgo/playgo_dialog.h b/src/core/libraries/playgo/playgo_dialog.h index fa9c64680..d9b991f48 100644 --- a/src/core/libraries/playgo/playgo_dialog.h +++ b/src/core/libraries/playgo/playgo_dialog.h @@ -34,5 +34,5 @@ CommonDialog::Error PS4_SYSV_ABI scePlayGoDialogOpen(const OrbisPlayGoDialogPara CommonDialog::Error PS4_SYSV_ABI scePlayGoDialogTerminate(); CommonDialog::Status PS4_SYSV_ABI scePlayGoDialogUpdateStatus(); -void RegisterlibScePlayGoDialog(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::PlayGo::Dialog diff --git a/src/core/libraries/random/random.cpp b/src/core/libraries/random/random.cpp index f7cc3fd2c..fd2053377 100644 --- a/src/core/libraries/random/random.cpp +++ b/src/core/libraries/random/random.cpp @@ -22,7 +22,7 @@ s32 PS4_SYSV_ABI sceRandomGetRandomNumber(u8* buf, std::size_t size) { return ORBIS_OK; } -void RegisterlibSceRandom(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("PI7jIZj4pcE", "libSceRandom", 1, "libSceRandom", 1, 1, sceRandomGetRandomNumber); }; diff --git a/src/core/libraries/random/random.h b/src/core/libraries/random/random.h index 172494106..9f86a900f 100644 --- a/src/core/libraries/random/random.h +++ b/src/core/libraries/random/random.h @@ -15,6 +15,6 @@ constexpr s32 SCE_RANDOM_MAX_SIZE = 64; s32 PS4_SYSV_ABI sceRandomGetRandomNumber(u8* buf, std::size_t size); -void RegisterlibSceRandom(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Random diff --git a/src/core/libraries/razor_cpu/razor_cpu.cpp b/src/core/libraries/razor_cpu/razor_cpu.cpp index 99707e972..f5cd952bf 100644 --- a/src/core/libraries/razor_cpu/razor_cpu.cpp +++ b/src/core/libraries/razor_cpu/razor_cpu.cpp @@ -180,7 +180,7 @@ s32 PS4_SYSV_ABI sceRazorCpuWriteBookmark() { return ORBIS_OK; } -void RegisterlibSceRazorCpu(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("JFzLJBlYIJE", "libSceRazorCpu", 1, "libSceRazorCpu", 1, 1, sceRazorCpuBeginLogicalFileAccess); LIB_FUNCTION("SfRTRZ1Sh+U", "libSceRazorCpu", 1, "libSceRazorCpu", 1, 1, diff --git a/src/core/libraries/razor_cpu/razor_cpu.h b/src/core/libraries/razor_cpu/razor_cpu.h index ec25e44b9..c8ed3c942 100644 --- a/src/core/libraries/razor_cpu/razor_cpu.h +++ b/src/core/libraries/razor_cpu/razor_cpu.h @@ -13,5 +13,5 @@ class SymbolsResolver; } namespace Libraries::RazorCpu { -void RegisterlibSceRazorCpu(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::RazorCpu \ No newline at end of file diff --git a/src/core/libraries/remote_play/remoteplay.cpp b/src/core/libraries/remote_play/remoteplay.cpp index b7402173e..1f2933755 100644 --- a/src/core/libraries/remote_play/remoteplay.cpp +++ b/src/core/libraries/remote_play/remoteplay.cpp @@ -219,7 +219,7 @@ int PS4_SYSV_ABI Func_1D5EE365ED5FADB3() { return ORBIS_OK; } -void RegisterlibSceRemoteplay(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("xQeIryTX7dY", "libSceRemoteplay", 1, "libSceRemoteplay", 0, 0, sceRemoteplayApprove); LIB_FUNCTION("IYZ+Mu+8tPo", "libSceRemoteplay", 1, "libSceRemoteplay", 0, 0, diff --git a/src/core/libraries/remote_play/remoteplay.h b/src/core/libraries/remote_play/remoteplay.h index 979f73a9e..35465d6df 100644 --- a/src/core/libraries/remote_play/remoteplay.h +++ b/src/core/libraries/remote_play/remoteplay.h @@ -58,5 +58,5 @@ int PS4_SYSV_ABI sceRemoteplaySetRpMode(); int PS4_SYSV_ABI sceRemoteplayTerminate(); int PS4_SYSV_ABI Func_1D5EE365ED5FADB3(); -void RegisterlibSceRemoteplay(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Remoteplay \ No newline at end of file diff --git a/src/core/libraries/save_data/dialog/savedatadialog.cpp b/src/core/libraries/save_data/dialog/savedatadialog.cpp index 2f0619165..3dd6d8ff9 100644 --- a/src/core/libraries/save_data/dialog/savedatadialog.cpp +++ b/src/core/libraries/save_data/dialog/savedatadialog.cpp @@ -139,7 +139,7 @@ Status PS4_SYSV_ABI sceSaveDataDialogUpdateStatus() { return g_status; } -void RegisterlibSceSaveDataDialog(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("fH46Lag88XY", "libSceSaveDataDialog", 1, "libSceSaveDataDialog", 1, 1, sceSaveDataDialogClose); LIB_FUNCTION("yEiJ-qqr6Cg", "libSceSaveDataDialog", 1, "libSceSaveDataDialog", 1, 1, diff --git a/src/core/libraries/save_data/dialog/savedatadialog.h b/src/core/libraries/save_data/dialog/savedatadialog.h index 34afe98a7..39450b36b 100644 --- a/src/core/libraries/save_data/dialog/savedatadialog.h +++ b/src/core/libraries/save_data/dialog/savedatadialog.h @@ -29,5 +29,5 @@ sceSaveDataDialogProgressBarSetValue(OrbisSaveDataDialogProgressBarTarget target CommonDialog::Error PS4_SYSV_ABI sceSaveDataDialogTerminate(); CommonDialog::Status PS4_SYSV_ABI sceSaveDataDialogUpdateStatus(); -void RegisterlibSceSaveDataDialog(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::SaveData::Dialog diff --git a/src/core/libraries/save_data/savedata.cpp b/src/core/libraries/save_data/savedata.cpp index b25ebde6c..62426d461 100644 --- a/src/core/libraries/save_data/savedata.cpp +++ b/src/core/libraries/save_data/savedata.cpp @@ -1723,7 +1723,7 @@ int PS4_SYSV_ABI Func_02E4C4D201716422() { return ORBIS_OK; } -void RegisterlibSceSaveData(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("dQ2GohUHXzk", "libSceSaveData", 1, "libSceSaveData", 1, 1, sceSaveDataAbort); LIB_FUNCTION("z1JA8-iJt3k", "libSceSaveData", 1, "libSceSaveData", 1, 1, sceSaveDataBackup); LIB_FUNCTION("kLJQ3XioYiU", "libSceSaveData", 1, "libSceSaveData", 1, 1, diff --git a/src/core/libraries/save_data/savedata.h b/src/core/libraries/save_data/savedata.h index 5faf3f2d5..d1c625980 100644 --- a/src/core/libraries/save_data/savedata.h +++ b/src/core/libraries/save_data/savedata.h @@ -184,5 +184,5 @@ int PS4_SYSV_ABI sceSaveDataUnregisterEventCallback(); int PS4_SYSV_ABI sceSaveDataUpload(); int PS4_SYSV_ABI Func_02E4C4D201716422(); -void RegisterlibSceSaveData(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::SaveData diff --git a/src/core/libraries/screenshot/screenshot.cpp b/src/core/libraries/screenshot/screenshot.cpp index eaa535de7..9c8e3c189 100644 --- a/src/core/libraries/screenshot/screenshot.cpp +++ b/src/core/libraries/screenshot/screenshot.cpp @@ -78,7 +78,7 @@ int PS4_SYSV_ABI sceScreenShotSetDrcParam() { return ORBIS_OK; } -void RegisterlibSceScreenShot(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("AS45QoYHjc4", "libSceScreenShot", 1, "libSceScreenShot", 0, 9, _Z5dummyv); LIB_FUNCTION("JuMLLmmvRgk", "libSceScreenShot", 1, "libSceScreenShot", 0, 9, sceScreenShotCapture); diff --git a/src/core/libraries/screenshot/screenshot.h b/src/core/libraries/screenshot/screenshot.h index d2fb4a4ea..0aee54173 100644 --- a/src/core/libraries/screenshot/screenshot.h +++ b/src/core/libraries/screenshot/screenshot.h @@ -26,5 +26,5 @@ int PS4_SYSV_ABI sceScreenShotSetOverlayImageWithOrigin(); int PS4_SYSV_ABI sceScreenShotSetParam(); int PS4_SYSV_ABI sceScreenShotSetDrcParam(); -void RegisterlibSceScreenShot(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::ScreenShot \ No newline at end of file diff --git a/src/core/libraries/share_play/shareplay.cpp b/src/core/libraries/share_play/shareplay.cpp index 8370438b9..9815d917b 100644 --- a/src/core/libraries/share_play/shareplay.cpp +++ b/src/core/libraries/share_play/shareplay.cpp @@ -131,7 +131,7 @@ int PS4_SYSV_ABI Func_F3DD6199DA15ED44() { return ORBIS_OK; } -void RegisterlibSceSharePlay(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("ggnCfalLU-8", "libSceSharePlay", 1, "libSceSharePlay", 0, 0, sceSharePlayCrashDaemon); LIB_FUNCTION("OOrLKB0bSDs", "libSceSharePlay", 1, "libSceSharePlay", 0, 0, diff --git a/src/core/libraries/share_play/shareplay.h b/src/core/libraries/share_play/shareplay.h index 8b1ad5f47..d515e02c1 100644 --- a/src/core/libraries/share_play/shareplay.h +++ b/src/core/libraries/share_play/shareplay.h @@ -50,5 +50,5 @@ int PS4_SYSV_ABI Func_C1C236728D88E177(); int PS4_SYSV_ABI Func_E9E80C474781F115(); int PS4_SYSV_ABI Func_F3DD6199DA15ED44(); -void RegisterlibSceSharePlay(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::SharePlay \ No newline at end of file diff --git a/src/core/libraries/signin_dialog/signindialog.cpp b/src/core/libraries/signin_dialog/signindialog.cpp index 0e4eb63a2..6cf0a8a07 100644 --- a/src/core/libraries/signin_dialog/signindialog.cpp +++ b/src/core/libraries/signin_dialog/signindialog.cpp @@ -44,7 +44,7 @@ s32 PS4_SYSV_ABI sceSigninDialogTerminate() { return ORBIS_OK; } -void RegisterlibSceSigninDialog(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("mlYGfmqE3fQ", "libSceSigninDialog", 1, "libSceSigninDialog", 1, 1, sceSigninDialogInitialize); LIB_FUNCTION("JlpJVoRWv7U", "libSceSigninDialog", 1, "libSceSigninDialog", 1, 1, diff --git a/src/core/libraries/signin_dialog/signindialog.h b/src/core/libraries/signin_dialog/signindialog.h index 8726ad1f6..35740efff 100644 --- a/src/core/libraries/signin_dialog/signindialog.h +++ b/src/core/libraries/signin_dialog/signindialog.h @@ -25,5 +25,5 @@ s32 PS4_SYSV_ABI sceSigninDialogGetResult(); s32 PS4_SYSV_ABI sceSigninDialogClose(); s32 PS4_SYSV_ABI sceSigninDialogTerminate(); -void RegisterlibSceSigninDialog(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::SigninDialog diff --git a/src/core/libraries/system/commondialog.cpp b/src/core/libraries/system/commondialog.cpp index cb9ce0442..8c3b819e5 100644 --- a/src/core/libraries/system/commondialog.cpp +++ b/src/core/libraries/system/commondialog.cpp @@ -156,7 +156,7 @@ int PS4_SYSV_ABI Func_F2AEE270605622B0() { return ORBIS_OK; } -void RegisterlibSceCommonDialog(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("2RdicdHhtGA", "libSceCommonDialog", 1, "libSceCommonDialog", 1, 1, _ZN3sce16CommonDialogUtil12getSelfAppIdEv); LIB_FUNCTION("I+tdxsCap08", "libSceCommonDialog", 1, "libSceCommonDialog", 1, 1, diff --git a/src/core/libraries/system/commondialog.h b/src/core/libraries/system/commondialog.h index 6b8ea3d95..cee783e32 100644 --- a/src/core/libraries/system/commondialog.h +++ b/src/core/libraries/system/commondialog.h @@ -81,5 +81,5 @@ int PS4_SYSV_ABI Func_B71349CF15FACAB0(); int PS4_SYSV_ABI Func_CB18E00EFA946C64(); int PS4_SYSV_ABI Func_F2AEE270605622B0(); -void RegisterlibSceCommonDialog(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::CommonDialog diff --git a/src/core/libraries/system/msgdialog.cpp b/src/core/libraries/system/msgdialog.cpp index 8a01f429f..980e361b5 100644 --- a/src/core/libraries/system/msgdialog.cpp +++ b/src/core/libraries/system/msgdialog.cpp @@ -149,7 +149,7 @@ Status PS4_SYSV_ABI sceMsgDialogUpdateStatus() { return g_status; } -void RegisterlibSceMsgDialog(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("HTrcDKlFKuM", "libSceMsgDialog", 1, "libSceMsgDialog", 1, 1, sceMsgDialogClose); LIB_FUNCTION("Lr8ovHH9l6A", "libSceMsgDialog", 1, "libSceMsgDialog", 1, 1, sceMsgDialogGetResult); diff --git a/src/core/libraries/system/msgdialog.h b/src/core/libraries/system/msgdialog.h index b8a1f3f07..9f8c065c3 100644 --- a/src/core/libraries/system/msgdialog.h +++ b/src/core/libraries/system/msgdialog.h @@ -29,5 +29,5 @@ CommonDialog::Error PS4_SYSV_ABI sceMsgDialogProgressBarSetValue(OrbisMsgDialogP CommonDialog::Error PS4_SYSV_ABI sceMsgDialogTerminate(); CommonDialog::Status PS4_SYSV_ABI sceMsgDialogUpdateStatus(); -void RegisterlibSceMsgDialog(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::MsgDialog diff --git a/src/core/libraries/system/posix.cpp b/src/core/libraries/system/posix.cpp index 524c74b90..d09366ca0 100644 --- a/src/core/libraries/system/posix.cpp +++ b/src/core/libraries/system/posix.cpp @@ -5,6 +5,6 @@ namespace Libraries::Posix { -void Registerlibsceposix(Core::Loader::SymbolsResolver* sym) {} +void RegisterLib(Core::Loader::SymbolsResolver* sym) {} } // namespace Libraries::Posix diff --git a/src/core/libraries/system/posix.h b/src/core/libraries/system/posix.h index 881718d7a..4d08a2785 100644 --- a/src/core/libraries/system/posix.h +++ b/src/core/libraries/system/posix.h @@ -8,5 +8,5 @@ class SymbolsResolver; } namespace Libraries::Posix { -void Registerlibsceposix(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Posix diff --git a/src/core/libraries/system/sysmodule.cpp b/src/core/libraries/system/sysmodule.cpp index d9e78e4ab..7105fd66b 100644 --- a/src/core/libraries/system/sysmodule.cpp +++ b/src/core/libraries/system/sysmodule.cpp @@ -134,7 +134,7 @@ int PS4_SYSV_ABI sceSysmoduleUnloadModuleInternalWithArg() { return ORBIS_OK; } -void RegisterlibSceSysmodule(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("D8cuU4d72xM", "libSceSysmodule", 1, "libSceSysmodule", 1, 1, sceSysmoduleGetModuleHandleInternal); LIB_FUNCTION("4fU5yvOkVG4", "libSceSysmodule", 1, "libSceSysmodule", 1, 1, diff --git a/src/core/libraries/system/sysmodule.h b/src/core/libraries/system/sysmodule.h index 9a5fe9513..27d0e19d4 100644 --- a/src/core/libraries/system/sysmodule.h +++ b/src/core/libraries/system/sysmodule.h @@ -170,5 +170,5 @@ int PS4_SYSV_ABI sceSysmoduleUnloadModuleByNameInternal(); int PS4_SYSV_ABI sceSysmoduleUnloadModuleInternal(); int PS4_SYSV_ABI sceSysmoduleUnloadModuleInternalWithArg(); -void RegisterlibSceSysmodule(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::SysModule diff --git a/src/core/libraries/system/systemservice.cpp b/src/core/libraries/system/systemservice.cpp index 9dc9dd781..d8f0b339b 100644 --- a/src/core/libraries/system/systemservice.cpp +++ b/src/core/libraries/system/systemservice.cpp @@ -2429,7 +2429,7 @@ void PushSystemServiceEvent(const OrbisSystemServiceEvent& event) { g_event_queue.push(event); } -void RegisterlibSceSystemService(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("alZfRdr2RP8", "libSceAppMessaging", 1, "libSceSystemService", 1, 1, sceAppMessagingClearEventFlag); LIB_FUNCTION("jKgAUl6cLy0", "libSceAppMessaging", 1, "libSceSystemService", 1, 1, diff --git a/src/core/libraries/system/systemservice.h b/src/core/libraries/system/systemservice.h index c22ccc88f..fec7be399 100644 --- a/src/core/libraries/system/systemservice.h +++ b/src/core/libraries/system/systemservice.h @@ -607,5 +607,5 @@ int PS4_SYSV_ABI Func_CB5E885E225F69F0(); void PushSystemServiceEvent(const OrbisSystemServiceEvent& event); -void RegisterlibSceSystemService(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::SystemService diff --git a/src/core/libraries/system/userservice.cpp b/src/core/libraries/system/userservice.cpp index b4bf189ea..90571e4bc 100644 --- a/src/core/libraries/system/userservice.cpp +++ b/src/core/libraries/system/userservice.cpp @@ -2167,7 +2167,7 @@ int PS4_SYSV_ABI Func_D2B814603E7B4477() { return ORBIS_OK; } -void RegisterlibSceUserService(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("Psl9mfs3duM", "libSceUserServiceForShellCore", 1, "libSceUserService", 1, 1, sceUserServiceInitializeForShellCore); LIB_FUNCTION("CydP+QtA0KI", "libSceUserServiceForShellCore", 1, "libSceUserService", 1, 1, diff --git a/src/core/libraries/system/userservice.h b/src/core/libraries/system/userservice.h index 66ac2b69d..30920e002 100644 --- a/src/core/libraries/system/userservice.h +++ b/src/core/libraries/system/userservice.h @@ -481,5 +481,5 @@ int PS4_SYSV_ABI Func_A6BDC9DFDAFD02B4(); int PS4_SYSV_ABI Func_BB9491DFE6B4953C(); int PS4_SYSV_ABI Func_D2B814603E7B4477(); -void RegisterlibSceUserService(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::UserService diff --git a/src/core/libraries/ulobjmgr/ulobjmgr.cpp b/src/core/libraries/ulobjmgr/ulobjmgr.cpp index cad6feda9..7f1658b56 100644 --- a/src/core/libraries/ulobjmgr/ulobjmgr.cpp +++ b/src/core/libraries/ulobjmgr/ulobjmgr.cpp @@ -35,7 +35,7 @@ s32 PS4_SYSV_ABI Func_4B07893BBB77A649(u64 arg0) { return ORBIS_OK; } -void RegisterlibSceUlobjmgr(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("BG26hBGiNlw", "ulobjmgr", 1, "ulobjmgr", 1, 1, Func_046DBA8411A2365C); LIB_FUNCTION("HZ9Q2c+4BU4", "ulobjmgr", 1, "ulobjmgr", 1, 1, Func_1D9F50D9CFB8054E); LIB_FUNCTION("Smf+fUNblPc", "ulobjmgr", 1, "ulobjmgr", 1, 1, Func_4A67FE7D435B94F7); diff --git a/src/core/libraries/ulobjmgr/ulobjmgr.h b/src/core/libraries/ulobjmgr/ulobjmgr.h index 9a1440e5c..baf90719c 100644 --- a/src/core/libraries/ulobjmgr/ulobjmgr.h +++ b/src/core/libraries/ulobjmgr/ulobjmgr.h @@ -10,5 +10,5 @@ class SymbolsResolver; } namespace Libraries::Ulobjmgr { -void RegisterlibSceUlobjmgr(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Ulobjmgr \ No newline at end of file diff --git a/src/core/libraries/usbd/usbd.cpp b/src/core/libraries/usbd/usbd.cpp index e5f6151eb..56280fdc4 100644 --- a/src/core/libraries/usbd/usbd.cpp +++ b/src/core/libraries/usbd/usbd.cpp @@ -478,7 +478,7 @@ int PS4_SYSV_ABI Func_D56B43060720B1E0() { return ORBIS_OK; } -void RegisterlibSceUsbd(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("0ktE1PhzGFU", "libSceUsbd", 1, "libSceUsbd", 1, 1, sceUsbdAllocTransfer); LIB_FUNCTION("BKMEGvfCPyU", "libSceUsbd", 1, "libSceUsbd", 1, 1, sceUsbdAttachKernelDriver); LIB_FUNCTION("fotb7DzeHYw", "libSceUsbd", 1, "libSceUsbd", 1, 1, sceUsbdBulkTransfer); diff --git a/src/core/libraries/usbd/usbd.h b/src/core/libraries/usbd/usbd.h index 3bd8134a7..0841036a4 100644 --- a/src/core/libraries/usbd/usbd.h +++ b/src/core/libraries/usbd/usbd.h @@ -150,5 +150,5 @@ int PS4_SYSV_ABI Func_97F056BAD90AADE7(); int PS4_SYSV_ABI Func_C55104A33B35B264(); int PS4_SYSV_ABI Func_D56B43060720B1E0(); -void RegisterlibSceUsbd(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Usbd \ No newline at end of file diff --git a/src/core/libraries/videodec/videodec.cpp b/src/core/libraries/videodec/videodec.cpp index ae7d17560..2894080f3 100644 --- a/src/core/libraries/videodec/videodec.cpp +++ b/src/core/libraries/videodec/videodec.cpp @@ -131,7 +131,7 @@ int PS4_SYSV_ABI sceVideodecReset(OrbisVideodecCtrl* pCtrlIn) { return ORBIS_OK; } -void RegisterlibSceVideodec(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("qkgRiwHyheU", "libSceVideodec", 1, "libSceVideodec", 1, 1, sceVideodecCreateDecoder); LIB_FUNCTION("q0W5GJMovMs", "libSceVideodec", 1, "libSceVideodec", 1, 1, sceVideodecDecode); diff --git a/src/core/libraries/videodec/videodec.h b/src/core/libraries/videodec/videodec.h index 45c5a6924..ab4bd9531 100644 --- a/src/core/libraries/videodec/videodec.h +++ b/src/core/libraries/videodec/videodec.h @@ -104,5 +104,5 @@ int PS4_SYSV_ABI sceVideodecQueryResourceInfo(const OrbisVideodecConfigInfo* pCf OrbisVideodecResourceInfo* pRsrcInfoOut); int PS4_SYSV_ABI sceVideodecReset(OrbisVideodecCtrl* pCtrlIn); -void RegisterlibSceVideodec(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Videodec \ No newline at end of file diff --git a/src/core/libraries/videodec/videodec2.cpp b/src/core/libraries/videodec/videodec2.cpp index 8c91e2bf1..ef14c223f 100644 --- a/src/core/libraries/videodec/videodec2.cpp +++ b/src/core/libraries/videodec/videodec2.cpp @@ -214,7 +214,7 @@ s32 PS4_SYSV_ABI sceVideodec2GetPictureInfo(const OrbisVideodec2OutputInfo* outp return ORBIS_OK; } -void RegisterlibSceVdec2(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("RnDibcGCPKw", "libSceVideodec2", 1, "libSceVideodec2", 1, 1, sceVideodec2QueryComputeMemoryInfo); LIB_FUNCTION("eD+X2SmxUt4", "libSceVideodec2", 1, "libSceVideodec2", 1, 1, diff --git a/src/core/libraries/videodec/videodec2.h b/src/core/libraries/videodec/videodec2.h index 410ee8ea6..0f080129f 100644 --- a/src/core/libraries/videodec/videodec2.h +++ b/src/core/libraries/videodec/videodec2.h @@ -137,5 +137,5 @@ s32 PS4_SYSV_ABI sceVideodec2Reset(OrbisVideodec2Decoder decoder); s32 PS4_SYSV_ABI sceVideodec2GetPictureInfo(const OrbisVideodec2OutputInfo* outputInfo, void* p1stPictureInfo, void* p2ndPictureInfo); -void RegisterlibSceVdec2(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Vdec2 \ No newline at end of file diff --git a/src/core/libraries/voice/voice.cpp b/src/core/libraries/voice/voice.cpp index caa16431a..7c912d798 100644 --- a/src/core/libraries/voice/voice.cpp +++ b/src/core/libraries/voice/voice.cpp @@ -166,7 +166,7 @@ s32 PS4_SYSV_ABI sceVoiceWriteToIPort() { return ORBIS_OK; } -void RegisterlibSceVoice(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("oV9GAdJ23Gw", "libSceVoice", 1, "libSceVoice", 0, 0, sceVoiceConnectIPortToOPort); LIB_FUNCTION("nXpje5yNpaE", "libSceVoice", 1, "libSceVoice", 0, 0, sceVoiceCreatePort); LIB_FUNCTION("b7kJI+nx2hg", "libSceVoice", 1, "libSceVoice", 0, 0, sceVoiceDeletePort); diff --git a/src/core/libraries/voice/voice.h b/src/core/libraries/voice/voice.h index 8f008f2cc..89467c83c 100644 --- a/src/core/libraries/voice/voice.h +++ b/src/core/libraries/voice/voice.h @@ -52,5 +52,5 @@ s32 PS4_SYSV_ABI sceVoiceVADAdjustment(); s32 PS4_SYSV_ABI sceVoiceVADSetVersion(); s32 PS4_SYSV_ABI sceVoiceWriteToIPort(); -void RegisterlibSceVoice(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Voice \ No newline at end of file diff --git a/src/core/libraries/web_browser_dialog/webbrowserdialog.cpp b/src/core/libraries/web_browser_dialog/webbrowserdialog.cpp index ee434f96a..0b1206249 100644 --- a/src/core/libraries/web_browser_dialog/webbrowserdialog.cpp +++ b/src/core/libraries/web_browser_dialog/webbrowserdialog.cpp @@ -78,7 +78,7 @@ s32 PS4_SYSV_ABI Func_F2BE042771625F8C() { return ORBIS_OK; } -void RegisterlibSceWebBrowserDialog(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("PSK+Eik919Q", "libSceWebBrowserDialog", 1, "libSceWebBrowserDialog", 1, 1, sceWebBrowserDialogClose); LIB_FUNCTION("Wit4LjeoeX4", "libSceWebBrowserDialog", 1, "libSceWebBrowserDialog", 1, 1, diff --git a/src/core/libraries/web_browser_dialog/webbrowserdialog.h b/src/core/libraries/web_browser_dialog/webbrowserdialog.h index aa118fe45..08f76a4fe 100644 --- a/src/core/libraries/web_browser_dialog/webbrowserdialog.h +++ b/src/core/libraries/web_browser_dialog/webbrowserdialog.h @@ -26,5 +26,5 @@ s32 PS4_SYSV_ABI sceWebBrowserDialogTerminate(); s32 PS4_SYSV_ABI sceWebBrowserDialogUpdateStatus(); s32 PS4_SYSV_ABI Func_F2BE042771625F8C(); -void RegisterlibSceWebBrowserDialog(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::WebBrowserDialog \ No newline at end of file diff --git a/src/core/libraries/zlib/zlib.cpp b/src/core/libraries/zlib/zlib.cpp index b304992ad..639cdc047 100644 --- a/src/core/libraries/zlib/zlib.cpp +++ b/src/core/libraries/zlib/zlib.cpp @@ -172,7 +172,7 @@ s32 PS4_SYSV_ABI sceZlibFinalize() { return ORBIS_OK; } -void RegisterlibSceZlib(Core::Loader::SymbolsResolver* sym) { +void RegisterLib(Core::Loader::SymbolsResolver* sym) { LIB_FUNCTION("m1YErdIXCp4", "libSceZlib", 1, "libSceZlib", 1, 1, sceZlibInitialize); LIB_FUNCTION("6na+Sa-B83w", "libSceZlib", 1, "libSceZlib", 1, 1, sceZlibFinalize); LIB_FUNCTION("TLar1HULv1Q", "libSceZlib", 1, "libSceZlib", 1, 1, sceZlibInflate); diff --git a/src/core/libraries/zlib/zlib_sce.h b/src/core/libraries/zlib/zlib_sce.h index 6f8cf9468..32d738f48 100644 --- a/src/core/libraries/zlib/zlib_sce.h +++ b/src/core/libraries/zlib/zlib_sce.h @@ -17,5 +17,5 @@ s32 PS4_SYSV_ABI sceZlibWaitForDone(u64* request_id, const u32* timeout); s32 PS4_SYSV_ABI sceZlibGetResult(u64 request_id, u32* dst_length, s32* status); s32 PS4_SYSV_ABI sceZlibFinalize(); -void RegisterlibSceZlib(Core::Loader::SymbolsResolver* sym); +void RegisterLib(Core::Loader::SymbolsResolver* sym); } // namespace Libraries::Zlib \ No newline at end of file diff --git a/src/emulator.cpp b/src/emulator.cpp index 480ceee0b..9485b0e23 100644 --- a/src/emulator.cpp +++ b/src/emulator.cpp @@ -99,9 +99,12 @@ void Emulator::Run(std::filesystem::path file, const std::vector ar ASSERT_MSG(param_sfo->Open(param_sfo_path), "Failed to open param.sfo"); const auto content_id = param_sfo->GetString("CONTENT_ID"); - ASSERT_MSG(content_id.has_value(), "Failed to get CONTENT_ID"); - - id = std::string(*content_id, 7, 9); + const auto title_id = param_sfo->GetString("TITLE_ID"); + if (content_id.has_value() && !content_id->empty()) { + id = std::string(*content_id, 7, 9); + } else if (title_id.has_value()) { + id = *title_id; + } title = param_sfo->GetString("TITLE").value_or("Unknown title"); fw_version = param_sfo->GetInteger("SYSTEM_VER").value_or(0x4700000); app_version = param_sfo->GetString("APP_VER").value_or("Unknown version"); diff --git a/src/qt_gui/settings_dialog.cpp b/src/qt_gui/settings_dialog.cpp index c0bd58b93..b08bb5aee 100644 --- a/src/qt_gui/settings_dialog.cpp +++ b/src/qt_gui/settings_dialog.cpp @@ -449,7 +449,7 @@ void SettingsDialog::LoadValuesFromConfig() { toml::find_or(data, "Settings", "consoleLanguage", 6))) % languageIndexes.size()); ui->emulatorLanguageComboBox->setCurrentIndex( - languages[toml::find_or(data, "GUI", "emulatorLanguage", "en_US")]); + languages[m_gui_settings->GetValue(gui::gen_guiLanguage).toString().toStdString()]); ui->hideCursorComboBox->setCurrentIndex(toml::find_or(data, "Input", "cursorState", 1)); OnCursorStateChanged(toml::find_or(data, "Input", "cursorState", 1)); ui->idleTimeoutSpinBox->setValue(toml::find_or(data, "Input", "cursorHideTimeout", 5)); diff --git a/src/qt_gui/translations/de_DE.ts b/src/qt_gui/translations/de_DE.ts index 46295c164..7e460afb8 100644 --- a/src/qt_gui/translations/de_DE.ts +++ b/src/qt_gui/translations/de_DE.ts @@ -527,71 +527,70 @@ unmapped - unmapped + Nicht zugeordnet L1 - L1 + L1 R1 - R1 + R1 L2 - L2 + L2 Options - Options + Optionen R2 - R2 + R2 Touchpad Left - Touchpad Left + Touchpad Links Touchpad Center - Touchpad Center + Touchpad Mitte Touchpad Right - Touchpad Right + Touchpad Rechts Triangle - Triangle + Dreieck Square - Square + Quadrat Circle - Circle + Kreis Cross - Cross + Kreuz Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: %1 - Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: - -%1 + %1 +Einzigartige Inputs können nicht öfters als einmal gebunden werden. Input-Duplikate werden auf folgende Knöpfe gebunden Press a button - Press a button + Drücke einen Knopf Move analog stick - Move analog stick + Bewege den Analogstick @@ -778,7 +777,7 @@ Favorite - Favorite + Favoriten @@ -984,11 +983,11 @@ Remove from Favorites - Remove from Favorites + Von Favoriten Entfernen Add to Favorites - Add to Favorites + Zu Favoriten hinzufügen @@ -1226,15 +1225,15 @@ Touchpad Left - Touchpad Left + Touchpad Links Touchpad Center - Touchpad Center + Touchpad Mitte Touchpad Right - Touchpad Right + Touchpad Rechts @@ -2080,7 +2079,7 @@ Hinweis: Der Sound funktioniert nur in Qt-Versionen. * Unsupported Vulkan Version - * Unsupported Vulkan Version + * Nicht unterstützte Vulkan Version diff --git a/src/qt_gui/translations/es_ES.ts b/src/qt_gui/translations/es_ES.ts index 72b18437c..ce434d83f 100644 --- a/src/qt_gui/translations/es_ES.ts +++ b/src/qt_gui/translations/es_ES.ts @@ -581,7 +581,9 @@ Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: %1 - No se puede asignar un control único más de una vez. Controles duplicados asignados a los siguientes botones + No se puede asignar un control único más de una vez. Controles duplicados asignados a los siguientes botones: + +%1 Press a button @@ -1218,7 +1220,9 @@ Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: %1 - No se puede asignar un control único más de una vez. Controles duplicados asignados a los siguientes botones: + No se puede asignar un control único más de una vez. Controles duplicados asignados a los siguientes botones: + +%1 Touchpad Left diff --git a/src/qt_gui/translations/pl_PL.ts b/src/qt_gui/translations/pl_PL.ts index c5611c5b1..0ea902c5a 100644 --- a/src/qt_gui/translations/pl_PL.ts +++ b/src/qt_gui/translations/pl_PL.ts @@ -527,71 +527,71 @@ unmapped - unmapped + nieprzypisane L1 - L1 + L1 R1 - R1 + R1 L2 - L2 + L2 Options - Options + Options R2 - R2 + R2 Touchpad Left - Touchpad Left + Lewy Touchpad Touchpad Center - Touchpad Center + Środkowy Touchpad Touchpad Right - Touchpad Right + Prawy Touchpad Triangle - Triangle + Trójkąt Square - Square + Kwadrat Circle - Circle + Kółko Cross - Cross + Krzyżyk Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: %1 - Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: + Nie można zbindować unikalnych akcji więcej niż raz. Zduplikowane akcje są przepisane do następujących przycisków: %1 Press a button - Press a button + Naciśnij przycisk Move analog stick - Move analog stick + Rusz gałką analogową @@ -778,7 +778,7 @@ Favorite - Favorite + Ulubione @@ -984,11 +984,11 @@ Remove from Favorites - Remove from Favorites + Usuń z Ulubionych Add to Favorites - Add to Favorites + Dodaj do Ulubionych @@ -1220,21 +1220,21 @@ Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: %1 - Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: + Nie można zbindować unikalnych akcji więcej niż raz. Zduplikowane akcje są przepisane do następujących przycisków: %1 Touchpad Left - Touchpad Left + Lewy Touchpad Touchpad Center - Touchpad Center + Środkowy Touchpad Touchpad Right - Touchpad Right + Prawy Touchpad @@ -1457,43 +1457,43 @@ Play - Play + Graj Pause - Pause + Pauza Stop - Stop + Stop Restart - Restart + Restart Full Screen - Full Screen + Pełny ekran Controllers - Controllers + Kontrolery Keyboard - Keyboard + Klawiatura Refresh List - Refresh List + Odśwież Listę Resume - Resume + Wznów Show Labels Under Icons - Show Labels Under Icons + Pokaż etykiety pod ikonami @@ -2076,7 +2076,7 @@ * Unsupported Vulkan Version - * Unsupported Vulkan Version + * Nieobsługiwana wersja Vulkan diff --git a/src/qt_gui/translations/sq_AL.ts b/src/qt_gui/translations/sq_AL.ts index 9908dc564..a0958f348 100644 --- a/src/qt_gui/translations/sq_AL.ts +++ b/src/qt_gui/translations/sq_AL.ts @@ -1220,7 +1220,7 @@ Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: %1 - Nuk mund të caktohet e njëjta hyrje unike më shumë se një herë. Hyrjet e dublikuara janë caktuar në butonët e mëposhtëm: + Nuk mund të caktohet e njëjta hyrje unike më shumë se një herë. Hyrjet e dyfishta janë caktuar në butonët e mëposhtëm: %1 diff --git a/src/qt_gui/translations/tr_TR.ts b/src/qt_gui/translations/tr_TR.ts index d4a94b42f..91d856482 100644 --- a/src/qt_gui/translations/tr_TR.ts +++ b/src/qt_gui/translations/tr_TR.ts @@ -531,15 +531,15 @@ L1 - L1 + L1 R1 - R1 + R1 L2 - L2 + L2 Options @@ -547,19 +547,19 @@ R2 - R2 + R2 Touchpad Left - Touchpad Left + Dokunmatik Yüzey Sol Touchpad Center - Touchpad Center + Dokunmatik Yüzey Orta Touchpad Right - Touchpad Right + Dokunmatik Yüzey Sağ Triangle @@ -591,7 +591,7 @@ Move analog stick - Move analog stick + Analog çubuğu taşı @@ -984,7 +984,7 @@ Remove from Favorites - Remove from Favorites + Favorilerden kaldır Add to Favorites @@ -1226,15 +1226,15 @@ Touchpad Left - Touchpad Left + Dokunmatik Yüzey Sol Touchpad Center - Touchpad Center + Dokunmatik Yüzey Orta Touchpad Right - Touchpad Right + Dokunmatik Yüzey Sağ diff --git a/src/qt_gui/translations/uk_UA.ts b/src/qt_gui/translations/uk_UA.ts index 73aa2c352..1f510e018 100644 --- a/src/qt_gui/translations/uk_UA.ts +++ b/src/qt_gui/translations/uk_UA.ts @@ -527,71 +527,71 @@ unmapped - unmapped + Не назначено L1 - L1 + L1 R1 - R1 + R1 L2 - L2 + L2 Options - Options + Опції R2 - R2 + R2 Touchpad Left - Touchpad Left + Ліва сторона сенсору Touchpad Center - Touchpad Center + Середина сенсору Touchpad Right - Touchpad Right + Права сторона сенсору Triangle - Triangle + Трикутник Square - Square + Квадрат Circle - Circle + Коло Cross - Cross + Хрест Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: %1 - Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: + Неможливо призначити одну й ту саму кнопку більше одного разу. Повторне призначення виявлено для таких кнопок: %1 Press a button - Press a button + Натисніть кнопку Move analog stick - Move analog stick + Перемістити аналоговий стік @@ -778,7 +778,7 @@ Favorite - Favorite + Обране @@ -984,11 +984,11 @@ Remove from Favorites - Remove from Favorites + Видалити з обраного Add to Favorites - Add to Favorites + Додати до обраного @@ -1220,21 +1220,21 @@ Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: %1 - Cannot bind any unique input more than once. Duplicate inputs mapped to the following buttons: + Унікальний вхід не може бути призначений двічі. Дублікати на кнопках: %1 Touchpad Left - Touchpad Left + Ліва сторона сенсору Touchpad Center - Touchpad Center + Середина сенсору Touchpad Right - Touchpad Right + Права сторона сенсору @@ -2076,7 +2076,7 @@ * Unsupported Vulkan Version - * Unsupported Vulkan Version + * Непідтримувана версія Vulkan diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.cpp b/src/shader_recompiler/backend/spirv/emit_spirv.cpp index c4c310586..baf9ced25 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp @@ -293,9 +293,17 @@ void SetupCapabilities(const Info& info, const Profile& profile, EmitContext& ct if (stage == LogicalStage::Geometry) { ctx.AddCapability(spv::Capability::Geometry); } - if (info.stage == Stage::Fragment && profile.needs_manual_interpolation) { - ctx.AddExtension("SPV_KHR_fragment_shader_barycentric"); - ctx.AddCapability(spv::Capability::FragmentBarycentricKHR); + if (info.stage == Stage::Fragment) { + if (profile.supports_amd_shader_explicit_vertex_parameter) { + ctx.AddExtension("SPV_AMD_shader_explicit_vertex_parameter"); + } else if (profile.supports_fragment_shader_barycentric) { + ctx.AddExtension("SPV_KHR_fragment_shader_barycentric"); + ctx.AddCapability(spv::Capability::FragmentBarycentricKHR); + } + if (info.loads.GetAny(IR::Attribute::BaryCoordSmoothSample) || + info.loads.GetAny(IR::Attribute::BaryCoordNoPerspSample)) { + ctx.AddCapability(spv::Capability::SampleRateShading); + } } if (stage == LogicalStage::TessellationControl || stage == LogicalStage::TessellationEval) { ctx.AddCapability(spv::Capability::Tessellation); diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp index 40f8d307c..ead2a2825 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_context_get_set.cpp @@ -45,7 +45,7 @@ Id VsOutputAttrPointer(EmitContext& ctx, VsOutput output) { return ctx.OpAccessChain(ctx.output_f32, ctx.cull_distances, cull_num); } default: - UNREACHABLE(); + UNREACHABLE_MSG("Vertex output {}", u32(output)); } } @@ -88,7 +88,7 @@ Id OutputAttrPointer(EmitContext& ctx, IR::Attribute attr, u32 element) { case IR::Attribute::Depth: return ctx.frag_depth; default: - throw NotImplementedException("Write attribute {}", attr); + UNREACHABLE_MSG("Write attribute {}", attr); } } @@ -111,7 +111,7 @@ std::pair OutputAttrComponentType(EmitContext& ctx, IR::Attribute attr case IR::Attribute::Depth: return {ctx.F32[1], false}; default: - throw NotImplementedException("Write attribute {}", attr); + UNREACHABLE_MSG("Write attribute {}", attr); } } } // Anonymous namespace @@ -159,81 +159,61 @@ Id EmitReadConstBuffer(EmitContext& ctx, u32 handle, Id index) { return result; } -static Id EmitGetAttributeForGeometry(EmitContext& ctx, IR::Attribute attr, u32 comp, u32 index) { - if (IR::IsPosition(attr)) { - ASSERT(attr == IR::Attribute::Position0); - const auto position_arr_ptr = ctx.TypePointer(spv::StorageClass::Input, ctx.F32[4]); - const auto pointer{ - ctx.OpAccessChain(position_arr_ptr, ctx.gl_in, ctx.ConstU32(index), ctx.ConstU32(0u))}; - const auto position_comp_ptr = ctx.TypePointer(spv::StorageClass::Input, ctx.F32[1]); - return ctx.OpLoad(ctx.F32[1], - ctx.OpAccessChain(position_comp_ptr, pointer, ctx.ConstU32(comp))); - } - - if (IR::IsParam(attr)) { - const u32 param_id{u32(attr) - u32(IR::Attribute::Param0)}; - const auto param = ctx.input_params.at(param_id).id; - const auto param_arr_ptr = ctx.TypePointer(spv::StorageClass::Input, ctx.F32[4]); - const auto pointer{ctx.OpAccessChain(param_arr_ptr, param, ctx.ConstU32(index))}; - const auto position_comp_ptr = ctx.TypePointer(spv::StorageClass::Input, ctx.F32[1]); - return ctx.OpLoad(ctx.F32[1], - ctx.OpAccessChain(position_comp_ptr, pointer, ctx.ConstU32(comp))); - } - UNREACHABLE(); -} - Id EmitGetAttribute(EmitContext& ctx, IR::Attribute attr, u32 comp, u32 index) { - if (ctx.info.l_stage == LogicalStage::Geometry) { - return EmitGetAttributeForGeometry(ctx, attr, comp, index); - } else if (ctx.info.l_stage == LogicalStage::TessellationControl || - ctx.info.l_stage == LogicalStage::TessellationEval) { - if (IR::IsTessCoord(attr)) { - const u32 component = attr == IR::Attribute::TessellationEvaluationPointU ? 0 : 1; - const auto component_ptr = ctx.TypePointer(spv::StorageClass::Input, ctx.F32[1]); - const auto pointer{ - ctx.OpAccessChain(component_ptr, ctx.tess_coord, ctx.ConstU32(component))}; - return ctx.OpLoad(ctx.F32[1], pointer); - } - UNREACHABLE(); - } - if (IR::IsParam(attr)) { const u32 param_index{u32(attr) - u32(IR::Attribute::Param0)}; const auto& param{ctx.input_params.at(param_index)}; - Id result; - if (param.is_loaded) { - // Attribute is either default or manually interpolated. The id points to an already - // loaded vector. - result = ctx.OpCompositeExtract(param.component_type, param.id, comp); - } else if (param.num_components > 1) { - // Attribute is a vector and we need to access a specific component. - const Id pointer{ctx.OpAccessChain(param.pointer_type, param.id, ctx.ConstU32(comp))}; - result = ctx.OpLoad(param.component_type, pointer); - } else { - // Attribute is a single float or interger, simply load it. - result = ctx.OpLoad(param.component_type, param.id); - } - if (param.is_integer) { - result = ctx.OpBitcast(ctx.F32[1], result); - } - return result; + const Id value = [&] { + if (param.is_array) { + ASSERT(param.num_components > 1); + if (param.is_loaded) { + return ctx.OpCompositeExtract(param.component_type, param.id_array[index], + comp); + } else { + return ctx.OpLoad(param.component_type, + ctx.OpAccessChain(param.pointer_type, param.id, + ctx.ConstU32(index), ctx.ConstU32(comp))); + } + } else { + ASSERT(!param.is_loaded); + if (param.num_components > 1) { + return ctx.OpLoad( + param.component_type, + ctx.OpAccessChain(param.pointer_type, param.id, ctx.ConstU32(comp))); + } else { + return ctx.OpLoad(param.component_type, param.id); + } + } + }(); + return param.is_integer ? ctx.OpBitcast(ctx.F32[1], value) : value; + } + if (IR::IsBarycentricCoord(attr) && ctx.profile.supports_fragment_shader_barycentric) { + ++comp; } - switch (attr) { - case IR::Attribute::FragCoord: { - const Id coord = ctx.OpLoad( - ctx.F32[1], ctx.OpAccessChain(ctx.input_f32, ctx.frag_coord, ctx.ConstU32(comp))); - if (comp == 3) { - return ctx.OpFDiv(ctx.F32[1], ctx.ConstF32(1.f), coord); - } - return coord; - } + case IR::Attribute::Position0: + ASSERT(ctx.l_stage == LogicalStage::Geometry); + return ctx.OpLoad(ctx.F32[1], + ctx.OpAccessChain(ctx.input_f32, ctx.gl_in, ctx.ConstU32(index), + ctx.ConstU32(0U), ctx.ConstU32(comp))); + case IR::Attribute::FragCoord: + return ctx.OpLoad(ctx.F32[1], + ctx.OpAccessChain(ctx.input_f32, ctx.frag_coord, ctx.ConstU32(comp))); case IR::Attribute::TessellationEvaluationPointU: return ctx.OpLoad(ctx.F32[1], ctx.OpAccessChain(ctx.input_f32, ctx.tess_coord, ctx.u32_zero_value)); case IR::Attribute::TessellationEvaluationPointV: return ctx.OpLoad(ctx.F32[1], ctx.OpAccessChain(ctx.input_f32, ctx.tess_coord, ctx.ConstU32(1U))); + case IR::Attribute::BaryCoordSmooth: + return ctx.OpLoad(ctx.F32[1], ctx.OpAccessChain(ctx.input_f32, ctx.bary_coord_smooth, + ctx.ConstU32(comp))); + case IR::Attribute::BaryCoordSmoothSample: + return ctx.OpLoad(ctx.F32[1], ctx.OpAccessChain(ctx.input_f32, ctx.bary_coord_smooth_sample, + ctx.ConstU32(comp))); + case IR::Attribute::BaryCoordNoPersp: + return ctx.OpLoad(ctx.F32[1], ctx.OpAccessChain(ctx.input_f32, ctx.bary_coord_nopersp, + ctx.ConstU32(comp))); default: UNREACHABLE_MSG("Read attribute {}", attr); } diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_special.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_special.cpp index fe7bd3356..70a44cbe4 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_special.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_special.cpp @@ -9,7 +9,7 @@ namespace Shader::Backend::SPIRV { void EmitPrologue(EmitContext& ctx) { if (ctx.stage == Stage::Fragment) { - ctx.DefineInterpolatedAttribs(); + ctx.DefineAmdPerVertexAttribs(); } if (ctx.info.loads.Get(IR::Attribute::WorkgroupIndex)) { ctx.DefineWorkgroupIndex(); diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp index e16bba755..f373808d9 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp @@ -196,14 +196,15 @@ const VectorIds& GetAttributeType(EmitContext& ctx, AmdGpu::NumberFormat fmt) { } EmitContext::SpirvAttribute EmitContext::GetAttributeInfo(AmdGpu::NumberFormat fmt, Id id, - u32 num_components, bool output) { + u32 num_components, bool output, + bool loaded, bool array) { switch (GetNumberClass(fmt)) { case AmdGpu::NumberClass::Float: - return {id, output ? output_f32 : input_f32, F32[1], num_components, false}; + return {id, output ? output_f32 : input_f32, F32[1], num_components, false, loaded, array}; case AmdGpu::NumberClass::Uint: - return {id, output ? output_u32 : input_u32, U32[1], num_components, true}; + return {id, output ? output_u32 : input_u32, U32[1], num_components, true, loaded, array}; case AmdGpu::NumberClass::Sint: - return {id, output ? output_s32 : input_s32, S32[1], num_components, true}; + return {id, output ? output_s32 : input_s32, S32[1], num_components, true, loaded, array}; default: break; } @@ -298,33 +299,24 @@ void EmitContext::DefineBufferProperties() { } } -void EmitContext::DefineInterpolatedAttribs() { - if (!profile.needs_manual_interpolation) { +void EmitContext::DefineAmdPerVertexAttribs() { + if (!profile.supports_amd_shader_explicit_vertex_parameter) { return; } - // Iterate all input attributes, load them and manually interpolate. for (s32 i = 0; i < runtime_info.fs_info.num_inputs; i++) { const auto& input = runtime_info.fs_info.inputs[i]; - auto& params = input_params[i]; - if (input.is_flat || params.is_loaded) { + if (input.IsDefault() || info.fs_interpolation[i].primary != Qualifier::PerVertex) { continue; } - const Id p_array{OpLoad(TypeArray(F32[4], ConstU32(3U)), params.id)}; - const Id p0{OpCompositeExtract(F32[4], p_array, 0U)}; - const Id p1{OpCompositeExtract(F32[4], p_array, 1U)}; - const Id p2{OpCompositeExtract(F32[4], p_array, 2U)}; - const Id p10{OpFSub(F32[4], p1, p0)}; - const Id p20{OpFSub(F32[4], p2, p0)}; - const Id bary_coord{OpLoad(F32[3], IsLinear(info.interp_qualifiers[i]) - ? bary_coord_linear_id - : bary_coord_persp_id)}; - const Id bary_coord_y{OpCompositeExtract(F32[1], bary_coord, 1)}; - const Id bary_coord_z{OpCompositeExtract(F32[1], bary_coord, 2)}; - const Id p10_y{OpVectorTimesScalar(F32[4], p10, bary_coord_y)}; - const Id p20_z{OpVectorTimesScalar(F32[4], p20, bary_coord_z)}; - params.id = OpFAdd(F32[4], p0, OpFAdd(F32[4], p10_y, p20_z)); - Name(params.id, fmt::format("fs_in_attr{}", i)); - params.is_loaded = true; + auto& param = input_params[i]; + const Id pointer = param.id; + param.id_array[0] = + OpInterpolateAtVertexAMD(F32[param.num_components], pointer, ConstU32(0U)); + param.id_array[1] = + OpInterpolateAtVertexAMD(F32[param.num_components], pointer, ConstU32(1U)); + param.id_array[2] = + OpInterpolateAtVertexAMD(F32[param.num_components], pointer, ConstU32(2U)); + param.is_loaded = true; } } @@ -342,21 +334,6 @@ void EmitContext::DefineWorkgroupIndex() { Name(workgroup_index_id, "workgroup_index"); } -Id MakeDefaultValue(EmitContext& ctx, u32 default_value) { - switch (default_value) { - case 0: - return ctx.ConstF32(0.f, 0.f, 0.f, 0.f); - case 1: - return ctx.ConstF32(0.f, 0.f, 0.f, 1.f); - case 2: - return ctx.ConstF32(1.f, 1.f, 1.f, 0.f); - case 3: - return ctx.ConstF32(1.f, 1.f, 1.f, 1.f); - default: - UNREACHABLE(); - } -} - void EmitContext::DefineInputs() { if (info.uses_lane_id) { subgroup_local_invocation_id = DefineVariable( @@ -398,49 +375,71 @@ void EmitContext::DefineInputs() { front_facing = DefineVariable(U1[1], spv::BuiltIn::FrontFacing, spv::StorageClass::Input); } - if (profile.needs_manual_interpolation) { - if (info.has_perspective_interp) { - bary_coord_persp_id = + if (info.loads.GetAny(IR::Attribute::BaryCoordSmooth)) { + if (profile.supports_amd_shader_explicit_vertex_parameter) { + bary_coord_smooth = DefineVariable(F32[2], spv::BuiltIn::BaryCoordSmoothAMD, + spv::StorageClass::Input); + } else if (profile.supports_fragment_shader_barycentric) { + bary_coord_smooth = DefineVariable(F32[3], spv::BuiltIn::BaryCoordKHR, spv::StorageClass::Input); + } else { + bary_coord_smooth = ConstF32(0.f, 0.f); } - if (info.has_linear_interp) { - bary_coord_linear_id = DefineVariable(F32[3], spv::BuiltIn::BaryCoordNoPerspKHR, - spv::StorageClass::Input); + } + if (info.loads.GetAny(IR::Attribute::BaryCoordSmoothSample)) { + if (profile.supports_amd_shader_explicit_vertex_parameter) { + bary_coord_smooth_sample = DefineVariable( + F32[2], spv::BuiltIn::BaryCoordSmoothSampleAMD, spv::StorageClass::Input); + } else if (profile.supports_fragment_shader_barycentric) { + bary_coord_smooth_sample = + DefineVariable(F32[3], spv::BuiltIn::BaryCoordKHR, spv::StorageClass::Input); + // Decorate(bary_coord_smooth_sample, spv::Decoration::Sample); + } else { + bary_coord_smooth_sample = ConstF32(0.f, 0.f); + } + } + if (info.loads.GetAny(IR::Attribute::BaryCoordNoPersp)) { + if (profile.supports_amd_shader_explicit_vertex_parameter) { + bary_coord_nopersp = DefineVariable(F32[2], spv::BuiltIn::BaryCoordNoPerspAMD, + spv::StorageClass::Input); + } else if (profile.supports_fragment_shader_barycentric) { + bary_coord_nopersp = DefineVariable(F32[3], spv::BuiltIn::BaryCoordNoPerspKHR, + spv::StorageClass::Input); + } else { + bary_coord_nopersp = ConstF32(0.f, 0.f); } } for (s32 i = 0; i < runtime_info.fs_info.num_inputs; i++) { const auto& input = runtime_info.fs_info.inputs[i]; if (input.IsDefault()) { - input_params[i] = { - .id = MakeDefaultValue(*this, input.default_value), - .pointer_type = input_f32, - .component_type = F32[1], - .num_components = 4, - .is_integer = false, - .is_loaded = true, - }; continue; } - const IR::Attribute param{IR::Attribute::Param0 + i}; + const IR::Attribute param = IR::Attribute::Param0 + i; const u32 num_components = info.loads.NumComponents(param); - const Id type{F32[num_components]}; - Id attr_id{}; - if (profile.needs_manual_interpolation && !input.is_flat) { - attr_id = DefineInput(TypeArray(type, ConstU32(3U)), input.param_index); - Decorate(attr_id, spv::Decoration::PerVertexKHR); - Name(attr_id, fmt::format("fs_in_attr{}_p", i)); - } else { - attr_id = DefineInput(type, input.param_index); - Name(attr_id, fmt::format("fs_in_attr{}", i)); - - if (input.is_flat) { - Decorate(attr_id, spv::Decoration::Flat); - } else if (IsLinear(info.interp_qualifiers[i])) { - Decorate(attr_id, spv::Decoration::NoPerspective); + const auto [primary, auxiliary] = info.fs_interpolation[i]; + const Id type = F32[num_components]; + const Id attr_id = [&] { + if (primary == Qualifier::PerVertex && + profile.supports_fragment_shader_barycentric) { + return Name(DefineInput(TypeArray(type, ConstU32(3U)), input.param_index), + fmt::format("fs_in_attr{}_p", i)); } + return Name(DefineInput(type, input.param_index), fmt::format("fs_in_attr{}", i)); + }(); + if (primary == Qualifier::PerVertex) { + Decorate(attr_id, profile.supports_amd_shader_explicit_vertex_parameter + ? spv::Decoration::ExplicitInterpAMD + : spv::Decoration::PerVertexKHR); + } else if (primary != Qualifier::Smooth) { + Decorate(attr_id, primary == Qualifier::Flat ? spv::Decoration::Flat + : spv::Decoration::NoPerspective); } - input_params[i] = - GetAttributeInfo(AmdGpu::NumberFormat::Float, attr_id, num_components, false); + if (auxiliary != Qualifier::None) { + Decorate(attr_id, auxiliary == Qualifier::Centroid ? spv::Decoration::Centroid + : spv::Decoration::Sample); + } + input_params[i] = GetAttributeInfo(AmdGpu::NumberFormat::Float, attr_id, num_components, + false, false, primary == Qualifier::PerVertex); } break; case LogicalStage::Compute: @@ -461,17 +460,16 @@ void EmitContext::DefineInputs() { case LogicalStage::Geometry: { primitive_id = DefineVariable(U32[1], spv::BuiltIn::PrimitiveId, spv::StorageClass::Input); const auto gl_per_vertex = - Name(TypeStruct(TypeVector(F32[1], 4), F32[1], TypeArray(F32[1], ConstU32(1u))), - "gl_PerVertex"); + Name(TypeStruct(F32[4], F32[1], TypeArray(F32[1], ConstU32(1u))), "gl_PerVertex"); MemberName(gl_per_vertex, 0, "gl_Position"); MemberName(gl_per_vertex, 1, "gl_PointSize"); MemberName(gl_per_vertex, 2, "gl_ClipDistance"); MemberDecorate(gl_per_vertex, 0, spv::Decoration::BuiltIn, - static_cast(spv::BuiltIn::Position)); + static_cast(spv::BuiltIn::Position)); MemberDecorate(gl_per_vertex, 1, spv::Decoration::BuiltIn, - static_cast(spv::BuiltIn::PointSize)); + static_cast(spv::BuiltIn::PointSize)); MemberDecorate(gl_per_vertex, 2, spv::Decoration::BuiltIn, - static_cast(spv::BuiltIn::ClipDistance)); + static_cast(spv::BuiltIn::ClipDistance)); Decorate(gl_per_vertex, spv::Decoration::Block); const auto num_verts_in = NumVertices(runtime_info.gs_info.in_primitive); const auto vertices_in = TypeArray(gl_per_vertex, ConstU32(num_verts_in)); @@ -483,7 +481,8 @@ void EmitContext::DefineInputs() { const Id type{TypeArray(F32[4], ConstU32(num_verts_in))}; const Id id{DefineInput(type, param_id)}; Name(id, fmt::format("gs_in_attr{}", param_id)); - input_params[param_id] = {id, input_f32, F32[1], 4}; + input_params[param_id] = + GetAttributeInfo(AmdGpu::NumberFormat::Float, id, 4, false, false, true); } break; } @@ -665,7 +664,7 @@ void EmitContext::DefineOutputs() { for (u32 attr_id = 0; attr_id < info.gs_copy_data.num_attrs; attr_id++) { const Id id{DefineOutput(F32[4], attr_id)}; Name(id, fmt::format("out_attr{}", attr_id)); - output_params[attr_id] = {id, output_f32, F32[1], 4u}; + output_params[attr_id] = GetAttributeInfo(AmdGpu::NumberFormat::Float, id, 4, true); } break; } diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.h b/src/shader_recompiler/backend/spirv/spirv_emit_context.h index 186925706..f57dbebd8 100644 --- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h +++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h @@ -45,7 +45,7 @@ public: Id Def(const IR::Value& value); void DefineBufferProperties(); - void DefineInterpolatedAttribs(); + void DefineAmdPerVertexAttribs(); void DefineWorkgroupIndex(); [[nodiscard]] Id DefineInput(Id type, std::optional location = std::nullopt, @@ -279,8 +279,9 @@ public: Id shared_memory_u32_type{}; Id shared_memory_u64_type{}; - Id bary_coord_persp_id{}; - Id bary_coord_linear_id{}; + Id bary_coord_smooth{}; + Id bary_coord_smooth_sample{}; + Id bary_coord_nopersp{}; struct TextureDefinition { const VectorIds* data_types; @@ -355,12 +356,16 @@ public: Id sampler_pointer_type{}; struct SpirvAttribute { - Id id; + union { + Id id; + std::array id_array; + }; Id pointer_type; Id component_type; u32 num_components; bool is_integer{}; bool is_loaded{}; + bool is_array{}; }; Id input_attr_array; Id output_attr_array; @@ -390,7 +395,7 @@ private: void DefineFunctions(); SpirvAttribute GetAttributeInfo(AmdGpu::NumberFormat fmt, Id id, u32 num_components, - bool output); + bool output, bool loaded = false, bool array = false); BufferSpv DefineBuffer(bool is_storage, bool is_written, u32 elem_shift, BufferType buffer_type, Id data_type); diff --git a/src/shader_recompiler/frontend/instruction.h b/src/shader_recompiler/frontend/instruction.h index 7c2e0bd1e..f4e7bc9f2 100644 --- a/src/shader_recompiler/frontend/instruction.h +++ b/src/shader_recompiler/frontend/instruction.h @@ -3,8 +3,6 @@ #pragma once -#include -#include "common/bit_field.h" #include "shader_recompiler/frontend/opcodes.h" namespace Shader::Gcn { diff --git a/src/shader_recompiler/frontend/translate/scalar_alu.cpp b/src/shader_recompiler/frontend/translate/scalar_alu.cpp index e3134c300..bb685d4bf 100644 --- a/src/shader_recompiler/frontend/translate/scalar_alu.cpp +++ b/src/shader_recompiler/frontend/translate/scalar_alu.cpp @@ -1,6 +1,7 @@ // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later +#include #include "common/assert.h" #include "shader_recompiler/frontend/translate/translate.h" @@ -680,9 +681,18 @@ void Translator::S_FF1_I32_B32(const GcnInst& inst) { } void Translator::S_FF1_I32_B64(const GcnInst& inst) { - ASSERT(inst.src[0].field == OperandField::ScalarGPR); - const IR::U32 result{ - ir.BallotFindLsb(ir.Ballot(ir.GetThreadBitScalarReg(IR::ScalarReg(inst.src[0].code))))}; + const auto src = [&] { + switch (inst.src[0].field) { + case OperandField::ScalarGPR: + return ir.GetThreadBitScalarReg(IR::ScalarReg(inst.src[0].code)); + case OperandField::VccLo: + return ir.GetVcc(); + default: + UNREACHABLE_MSG("unhandled operand type {}", magic_enum::enum_name(inst.src[0].field)); + } + }(); + const IR::U32 result{ir.BallotFindLsb(ir.Ballot(src))}; + SetDst(inst.dst[0], result); } diff --git a/src/shader_recompiler/frontend/translate/translate.cpp b/src/shader_recompiler/frontend/translate/translate.cpp index 310ac9156..578c1f96a 100644 --- a/src/shader_recompiler/frontend/translate/translate.cpp +++ b/src/shader_recompiler/frontend/translate/translate.cpp @@ -21,50 +21,39 @@ namespace Shader::Gcn { -Translator::Translator(Info& info_, const RuntimeInfo& runtime_info_, const Profile& profile_) - : info{info_}, runtime_info{runtime_info_}, profile{profile_}, - next_vgpr_num{runtime_info.num_allocated_vgprs} { - if (info.l_stage == LogicalStage::Fragment) { - dst_frag_vreg = GatherInterpQualifiers(); +static IR::VectorReg IterateBarycentrics(const RuntimeInfo& runtime_info, auto&& set_attribute) { + if (runtime_info.stage != Stage::Fragment) { + return IR::VectorReg::V0; } -} - -IR::VectorReg Translator::GatherInterpQualifiers() { u32 dst_vreg{}; if (runtime_info.fs_info.addr_flags.persp_sample_ena) { - vgpr_to_interp[dst_vreg++] = IR::Interpolation::PerspectiveSample; // I - vgpr_to_interp[dst_vreg++] = IR::Interpolation::PerspectiveSample; // J - info.has_perspective_interp = true; + set_attribute(dst_vreg++, IR::Attribute::BaryCoordSmoothSample, 0); // I + set_attribute(dst_vreg++, IR::Attribute::BaryCoordSmoothSample, 1); // J } if (runtime_info.fs_info.addr_flags.persp_center_ena) { - vgpr_to_interp[dst_vreg++] = IR::Interpolation::PerspectiveCenter; // I - vgpr_to_interp[dst_vreg++] = IR::Interpolation::PerspectiveCenter; // J - info.has_perspective_interp = true; + set_attribute(dst_vreg++, IR::Attribute::BaryCoordSmooth, 0); // I + set_attribute(dst_vreg++, IR::Attribute::BaryCoordSmooth, 1); // J } if (runtime_info.fs_info.addr_flags.persp_centroid_ena) { - vgpr_to_interp[dst_vreg++] = IR::Interpolation::PerspectiveCentroid; // I - vgpr_to_interp[dst_vreg++] = IR::Interpolation::PerspectiveCentroid; // J - info.has_perspective_interp = true; + set_attribute(dst_vreg++, IR::Attribute::BaryCoordSmoothCentroid, 0); // I + set_attribute(dst_vreg++, IR::Attribute::BaryCoordSmoothCentroid, 1); // J } if (runtime_info.fs_info.addr_flags.persp_pull_model_ena) { - ++dst_vreg; // I/W - ++dst_vreg; // J/W - ++dst_vreg; // 1/W + set_attribute(dst_vreg++, IR::Attribute::BaryCoordPullModel, 0); // I/W + set_attribute(dst_vreg++, IR::Attribute::BaryCoordPullModel, 1); // J/W + set_attribute(dst_vreg++, IR::Attribute::BaryCoordPullModel, 2); // 1/W } if (runtime_info.fs_info.addr_flags.linear_sample_ena) { - vgpr_to_interp[dst_vreg++] = IR::Interpolation::LinearSample; // I - vgpr_to_interp[dst_vreg++] = IR::Interpolation::LinearSample; // J - info.has_linear_interp = true; + set_attribute(dst_vreg++, IR::Attribute::BaryCoordNoPerspSample, 0); // I + set_attribute(dst_vreg++, IR::Attribute::BaryCoordNoPerspSample, 1); // J } if (runtime_info.fs_info.addr_flags.linear_center_ena) { - vgpr_to_interp[dst_vreg++] = IR::Interpolation::LinearCenter; // I - vgpr_to_interp[dst_vreg++] = IR::Interpolation::LinearCenter; // J - info.has_linear_interp = true; + set_attribute(dst_vreg++, IR::Attribute::BaryCoordNoPersp, 0); // I + set_attribute(dst_vreg++, IR::Attribute::BaryCoordNoPersp, 1); // J } if (runtime_info.fs_info.addr_flags.linear_centroid_ena) { - vgpr_to_interp[dst_vreg++] = IR::Interpolation::LinearCentroid; // I - vgpr_to_interp[dst_vreg++] = IR::Interpolation::LinearCentroid; // J - info.has_linear_interp = true; + set_attribute(dst_vreg++, IR::Attribute::BaryCoordNoPerspCentroid, 0); // I + set_attribute(dst_vreg++, IR::Attribute::BaryCoordNoPerspCentroid, 1); // J } if (runtime_info.fs_info.addr_flags.line_stipple_tex_ena) { ++dst_vreg; @@ -72,6 +61,14 @@ IR::VectorReg Translator::GatherInterpQualifiers() { return IR::VectorReg(dst_vreg); } +Translator::Translator(Info& info_, const RuntimeInfo& runtime_info_, const Profile& profile_) + : info{info_}, runtime_info{runtime_info_}, profile{profile_}, + next_vgpr_num{runtime_info.num_allocated_vgprs} { + IterateBarycentrics(runtime_info, [this](u32 vreg, IR::Attribute attrib, u32) { + vgpr_to_interp[vreg] = attrib; + }); +} + void Translator::EmitPrologue(IR::Block* first_block) { ir = IR::IREmitter(*first_block, first_block->begin()); @@ -127,7 +124,10 @@ void Translator::EmitPrologue(IR::Block* first_block) { } break; case LogicalStage::Fragment: - dst_vreg = dst_frag_vreg; + dst_vreg = + IterateBarycentrics(runtime_info, [this](u32 vreg, IR::Attribute attrib, u32 comp) { + ir.SetVectorReg(IR::VectorReg(vreg), ir.GetAttribute(attrib, comp)); + }); if (runtime_info.fs_info.addr_flags.pos_x_float_ena) { if (runtime_info.fs_info.en_flags.pos_x_float_ena) { ir.SetVectorReg(dst_vreg++, ir.GetAttribute(IR::Attribute::FragCoord, 0)); @@ -151,7 +151,8 @@ void Translator::EmitPrologue(IR::Block* first_block) { } if (runtime_info.fs_info.addr_flags.pos_w_float_ena) { if (runtime_info.fs_info.en_flags.pos_w_float_ena) { - ir.SetVectorReg(dst_vreg++, ir.GetAttribute(IR::Attribute::FragCoord, 3)); + ir.SetVectorReg(dst_vreg++, + ir.FPRecip(ir.GetAttribute(IR::Attribute::FragCoord, 3))); } else { ir.SetVectorReg(dst_vreg++, ir.Imm32(0.0f)); } diff --git a/src/shader_recompiler/frontend/translate/translate.h b/src/shader_recompiler/frontend/translate/translate.h index 4b5ff827b..a29bdc993 100644 --- a/src/shader_recompiler/frontend/translate/translate.h +++ b/src/shader_recompiler/frontend/translate/translate.h @@ -265,6 +265,7 @@ public: // Vector interpolation // VINTRP + void V_INTERP_P1_F32(const GcnInst& inst); void V_INTERP_P2_F32(const GcnInst& inst); void V_INTERP_MOV_F32(const GcnInst& inst); @@ -323,7 +324,6 @@ private: void LogMissingOpcode(const GcnInst& inst); IR::VectorReg GetScratchVgpr(u32 offset); - IR::VectorReg GatherInterpQualifiers(); private: IR::IREmitter ir; @@ -332,8 +332,7 @@ private: const Profile& profile; u32 next_vgpr_num; std::unordered_map vgpr_map; - std::array vgpr_to_interp{}; - IR::VectorReg dst_frag_vreg{}; + std::array vgpr_to_interp{}; bool opcode_missing = false; }; diff --git a/src/shader_recompiler/frontend/translate/vector_interpolation.cpp b/src/shader_recompiler/frontend/translate/vector_interpolation.cpp index 5a287dbe2..c32e80815 100644 --- a/src/shader_recompiler/frontend/translate/vector_interpolation.cpp +++ b/src/shader_recompiler/frontend/translate/vector_interpolation.cpp @@ -5,11 +5,32 @@ namespace Shader::Gcn { +using Interpolation = Info::Interpolation; + +static Interpolation GetInterpolation(IR::Attribute attribute) { + switch (attribute) { + case IR::Attribute::BaryCoordNoPersp: + return {Qualifier::NoPerspective, Qualifier::None}; + case IR::Attribute::BaryCoordNoPerspCentroid: + return {Qualifier::NoPerspective, Qualifier::Centroid}; + case IR::Attribute::BaryCoordNoPerspSample: + return {Qualifier::NoPerspective, Qualifier::Sample}; + case IR::Attribute::BaryCoordSmooth: + return {Qualifier::Smooth, Qualifier::None}; + case IR::Attribute::BaryCoordSmoothCentroid: + return {Qualifier::Smooth, Qualifier::Centroid}; + case IR::Attribute::BaryCoordSmoothSample: + return {Qualifier::Smooth, Qualifier::Sample}; + default: + UNREACHABLE_MSG("Unhandled barycentric attribute {}", NameOf(attribute)); + } +} + void Translator::EmitVectorInterpolation(const GcnInst& inst) { switch (inst.opcode) { // VINTRP case Opcode::V_INTERP_P1_F32: - return; + return V_INTERP_P1_F32(inst); case Opcode::V_INTERP_P2_F32: return V_INTERP_P2_F32(inst); case Opcode::V_INTERP_MOV_F32: @@ -21,19 +42,57 @@ void Translator::EmitVectorInterpolation(const GcnInst& inst) { // VINTRP +void Translator::V_INTERP_P1_F32(const GcnInst& inst) { + if (!profile.needs_manual_interpolation) { + return; + } + // VDST = P10 * VSRC + P0 + const u32 attr_index = inst.control.vintrp.attr; + const IR::Attribute attrib = IR::Attribute::Param0 + attr_index; + const IR::F32 p0 = ir.GetAttribute(attrib, inst.control.vintrp.chan, 0); + const IR::F32 p1 = ir.GetAttribute(attrib, inst.control.vintrp.chan, 1); + const IR::F32 i = GetSrc(inst.src[0]); + const IR::F32 result = ir.FPFma(ir.FPSub(p1, p0), i, p0); + SetDst(inst.dst[0], result); +} + void Translator::V_INTERP_P2_F32(const GcnInst& inst) { const u32 attr_index = inst.control.vintrp.attr; - const auto& attr = runtime_info.fs_info.inputs.at(attr_index); - info.interp_qualifiers[attr_index] = vgpr_to_interp[inst.src[0].code]; - const IR::Attribute attrib{IR::Attribute::Param0 + attr_index}; - SetDst(inst.dst[0], ir.GetAttribute(attrib, inst.control.vintrp.chan)); + const IR::Attribute attrib = IR::Attribute::Param0 + attr_index; + const auto& attr = runtime_info.fs_info.inputs[attr_index]; + auto& interp = info.fs_interpolation[attr_index]; + ASSERT(!attr.IsDefault() && !attr.is_flat); + if (!profile.needs_manual_interpolation) { + interp = GetInterpolation(vgpr_to_interp[inst.src[0].code]); + SetDst(inst.dst[0], ir.GetAttribute(attrib, inst.control.vintrp.chan)); + return; + } + // VDST = P20 * VSRC + VDST + const IR::F32 p0 = ir.GetAttribute(attrib, inst.control.vintrp.chan, 0); + const IR::F32 p2 = ir.GetAttribute(attrib, inst.control.vintrp.chan, 2); + const IR::F32 j = GetSrc(inst.src[0]); + const IR::F32 result = ir.FPFma(ir.FPSub(p2, p0), j, GetSrc(inst.dst[0])); + interp.primary = Qualifier::PerVertex; + SetDst(inst.dst[0], result); } void Translator::V_INTERP_MOV_F32(const GcnInst& inst) { const u32 attr_index = inst.control.vintrp.attr; - const auto& attr = runtime_info.fs_info.inputs.at(attr_index); - const IR::Attribute attrib{IR::Attribute::Param0 + attr_index}; - SetDst(inst.dst[0], ir.GetAttribute(attrib, inst.control.vintrp.chan)); + const IR::Attribute attrib = IR::Attribute::Param0 + attr_index; + const auto& attr = runtime_info.fs_info.inputs[attr_index]; + auto& interp = info.fs_interpolation[attr_index]; + ASSERT(attr.is_flat); + if (profile.supports_amd_shader_explicit_vertex_parameter || + (profile.supports_fragment_shader_barycentric && + !profile.has_incomplete_fragment_shader_barycentric)) { + // VSRC 0=P10, 1=P20, 2=P0 + interp.primary = Qualifier::PerVertex; + SetDst(inst.dst[0], + ir.GetAttribute(attrib, inst.control.vintrp.chan, (inst.src[0].code + 1) % 3)); + } else { + interp.primary = Qualifier::Flat; + SetDst(inst.dst[0], ir.GetAttribute(attrib, inst.control.vintrp.chan)); + } } } // namespace Shader::Gcn diff --git a/src/shader_recompiler/info.h b/src/shader_recompiler/info.h index 6e12c6816..11dd9c05e 100644 --- a/src/shader_recompiler/info.h +++ b/src/shader_recompiler/info.h @@ -1,5 +1,6 @@ // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later + #pragma once #include @@ -135,6 +136,16 @@ struct PushData { static_assert(sizeof(PushData) <= 128, "PushData size is greater than minimum size guaranteed by Vulkan spec"); +enum class Qualifier : u8 { + None, + Smooth, + NoPerspective, + PerVertex, + Flat, + Centroid, + Sample, +}; + /** * Contains general information generated by the shader recompiler for an input program. */ @@ -194,7 +205,11 @@ struct Info { PersistentSrtInfo srt_info; std::vector flattened_ud_buf; - std::array interp_qualifiers{}; + struct Interpolation { + Qualifier primary; + Qualifier auxiliary; + }; + std::array fs_interpolation{}; IR::ScalarReg tess_consts_ptr_base = IR::ScalarReg::Max; s32 tess_consts_dword_offset = -1; @@ -207,10 +222,9 @@ struct Info { VAddr pgm_base; bool has_storage_images{}; bool has_discard{}; + bool has_bitwise_xor{}; bool has_image_gather{}; bool has_image_query{}; - bool has_perspective_interp{}; - bool has_linear_interp{}; bool uses_buffer_atomic_float_min_max{}; bool uses_image_atomic_float_min_max{}; bool uses_lane_id{}; diff --git a/src/shader_recompiler/ir/attribute.cpp b/src/shader_recompiler/ir/attribute.cpp index b2f11d141..094c34ee8 100644 --- a/src/shader_recompiler/ir/attribute.cpp +++ b/src/shader_recompiler/ir/attribute.cpp @@ -130,6 +130,20 @@ std::string NameOf(Attribute attribute) { return "LocalInvocationIndex"; case Attribute::FragCoord: return "FragCoord"; + case Attribute::BaryCoordNoPersp: + return "BaryCoordNoPersp"; + case Attribute::BaryCoordNoPerspCentroid: + return "BaryCoordNoPerspCentroid"; + case Attribute::BaryCoordNoPerspSample: + return "BaryCoordNoPerspSample"; + case Attribute::BaryCoordSmooth: + return "BaryCoordSmooth"; + case Attribute::BaryCoordSmoothCentroid: + return "BaryCoordSmoothCentroid"; + case Attribute::BaryCoordSmoothSample: + return "BaryCoordSmoothSample"; + case Attribute::BaryCoordPullModel: + return "BaryCoordPullModel"; case Attribute::InvocationId: return "InvocationId"; case Attribute::PatchVertices: diff --git a/src/shader_recompiler/ir/attribute.h b/src/shader_recompiler/ir/attribute.h index b6b1c8b59..58f28fb81 100644 --- a/src/shader_recompiler/ir/attribute.h +++ b/src/shader_recompiler/ir/attribute.h @@ -73,24 +73,21 @@ enum class Attribute : u64 { LocalInvocationId = 76, LocalInvocationIndex = 77, FragCoord = 78, - InvocationId = 81, // TCS id in output patch and instanced geometry shader id - PatchVertices = 82, - TessellationEvaluationPointU = 83, - TessellationEvaluationPointV = 84, - PackedHullInvocationInfo = 85, // contains patch id within the VGT and invocation ID + BaryCoordNoPersp = 79, + BaryCoordNoPerspCentroid = 80, + BaryCoordNoPerspSample = 81, + BaryCoordSmooth = 82, + BaryCoordSmoothCentroid = 83, + BaryCoordSmoothSample = 84, + BaryCoordPullModel = 85, + InvocationId = 86, // TCS id in output patch and instanced geometry shader id + PatchVertices = 87, + TessellationEvaluationPointU = 88, + TessellationEvaluationPointV = 89, + PackedHullInvocationInfo = 90, // contains patch id within the VGT and invocation ID Max, }; -enum class Interpolation { - Invalid = 0, - PerspectiveSample = 1, - PerspectiveCenter = 2, - PerspectiveCentroid = 3, - LinearSample = 4, - LinearCenter = 5, - LinearCentroid = 6, -}; - constexpr size_t NumAttributes = static_cast(Attribute::Max); constexpr size_t NumRenderTargets = 8; constexpr size_t NumParams = 32; @@ -112,13 +109,9 @@ constexpr bool IsMrt(Attribute attribute) noexcept { return attribute >= Attribute::RenderTarget0 && attribute <= Attribute::RenderTarget7; } -constexpr bool IsLinear(Interpolation interp) noexcept { - return interp >= Interpolation::LinearSample && interp <= Interpolation::LinearCentroid; -} - -constexpr bool IsPerspective(Interpolation interp) noexcept { - return interp >= Interpolation::PerspectiveSample && - interp <= Interpolation::PerspectiveCentroid; +constexpr bool IsBarycentricCoord(Attribute attribute) noexcept { + return attribute >= Attribute::BaryCoordNoPersp && + attribute <= Attribute::BaryCoordSmoothSample; } [[nodiscard]] std::string NameOf(Attribute attribute); diff --git a/src/shader_recompiler/ir/passes/resource_tracking_pass.cpp b/src/shader_recompiler/ir/passes/resource_tracking_pass.cpp index e5a4beb8b..2cf39c98e 100644 --- a/src/shader_recompiler/ir/passes/resource_tracking_pass.cpp +++ b/src/shader_recompiler/ir/passes/resource_tracking_pass.cpp @@ -455,11 +455,12 @@ void PatchImageSharp(IR::Block& block, IR::Inst& inst, Info& info, Descriptors& // Read image sharp. const auto tsharp = TrackSharp(tsharp_handle, info); const auto inst_info = inst.Flags(); - const bool is_written = inst.GetOpcode() == IR::Opcode::ImageWrite; + const bool is_atomic = IsImageAtomicInstruction(inst); + const bool is_written = inst.GetOpcode() == IR::Opcode::ImageWrite || is_atomic; const ImageResource image_res = { .sharp_idx = tsharp, .is_depth = bool(inst_info.is_depth), - .is_atomic = IsImageAtomicInstruction(inst), + .is_atomic = is_atomic, .is_array = bool(inst_info.is_array), .is_written = is_written, .is_r128 = bool(inst_info.is_r128), diff --git a/src/shader_recompiler/ir/passes/shader_info_collection_pass.cpp b/src/shader_recompiler/ir/passes/shader_info_collection_pass.cpp index 079827866..8f0e61da2 100644 --- a/src/shader_recompiler/ir/passes/shader_info_collection_pass.cpp +++ b/src/shader_recompiler/ir/passes/shader_info_collection_pass.cpp @@ -95,6 +95,9 @@ void Visit(Info& info, const IR::Inst& inst) { case IR::Opcode::DiscardCond: info.has_discard = true; break; + case IR::Opcode::BitwiseXor32: + info.has_bitwise_xor = true; + break; case IR::Opcode::ImageGather: case IR::Opcode::ImageGatherDref: info.has_image_gather = true; diff --git a/src/shader_recompiler/profile.h b/src/shader_recompiler/profile.h index ad36a2e13..d57e18ff0 100644 --- a/src/shader_recompiler/profile.h +++ b/src/shader_recompiler/profile.h @@ -10,16 +10,10 @@ namespace Shader { struct Profile { u32 supported_spirv{0x00010000}; u32 subgroup_size{}; - bool unified_descriptor_binding{}; - bool support_descriptor_aliasing{}; bool support_int8{}; bool support_int16{}; bool support_int64{}; bool support_float64{}; - bool support_vertex_instance_id{}; - bool support_float_controls{}; - bool support_separate_denorm_behavior{}; - bool support_separate_rounding_mode{}; bool support_fp32_denorm_preserve{}; bool support_fp32_denorm_flush{}; bool support_fp32_round_to_zero{}; @@ -33,6 +27,9 @@ struct Profile { bool supports_buffer_int64_atomics{}; bool supports_shared_int64_atomics{}; bool supports_workgroup_explicit_memory_layout{}; + bool supports_amd_shader_explicit_vertex_parameter{}; + bool supports_fragment_shader_barycentric{}; + bool has_incomplete_fragment_shader_barycentric{}; bool has_broken_spirv_clamp{}; bool lower_left_origin_mode{}; bool needs_manual_interpolation{}; diff --git a/src/video_core/amdgpu/liverpool.h b/src/video_core/amdgpu/liverpool.h index c517285fb..d693a0a38 100644 --- a/src/video_core/amdgpu/liverpool.h +++ b/src/video_core/amdgpu/liverpool.h @@ -1009,7 +1009,6 @@ struct Liverpool { return RemapSwizzle(info.format, mrt_swizzle); } - private: [[nodiscard]] NumberFormat GetFixedNumberFormat() const { // There is a small difference between T# and CB number types, account for it. return info.number_type == NumberFormat::SnormNz ? NumberFormat::Srgb diff --git a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp index fd1a91260..cd597e16c 100644 --- a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp +++ b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp @@ -807,8 +807,8 @@ vk::Format DepthFormat(DepthBuffer::ZFormat z_format, DepthBuffer::StencilFormat vk::ClearValue ColorBufferClearValue(const AmdGpu::Liverpool::ColorBuffer& color_buffer) { const auto comp_swizzle = color_buffer.Swizzle(); - const auto format = color_buffer.GetDataFmt(); - const auto number_type = color_buffer.GetNumberFmt(); + const auto format = color_buffer.info.format.Value(); + const auto number_type = color_buffer.GetFixedNumberFormat(); const auto& c0 = color_buffer.clear_word0; const auto& c1 = color_buffer.clear_word1; diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 10e5bed5f..4d89c83b2 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -137,34 +137,18 @@ GraphicsPipeline::GraphicsPipeline( const vk::PipelineMultisampleStateCreateInfo multisampling = { .rasterizationSamples = LiverpoolToVK::NumSamples(key.num_samples, instance.GetFramebufferSampleCounts()), - .sampleShadingEnable = false, + .sampleShadingEnable = + fs_info.addr_flags.persp_sample_ena || fs_info.addr_flags.linear_sample_ena, }; - const vk::DepthClampRangeEXT depth_clamp_range = { - .minDepthClamp = key.min_depth_clamp, - .maxDepthClamp = key.max_depth_clamp, + const vk::PipelineViewportDepthClipControlCreateInfoEXT clip_control = { + .negativeOneToOne = key.clip_space == Liverpool::ClipSpace::MinusWToW, }; - vk::StructureChain viewport_chain = { - vk::PipelineViewportStateCreateInfo{}, - vk::PipelineViewportDepthClipControlCreateInfoEXT{ - .negativeOneToOne = key.clip_space == Liverpool::ClipSpace::MinusWToW, - }, - vk::PipelineViewportDepthClampControlCreateInfoEXT{ - .depthClampMode = key.depth_clamp_user_defined_range - ? vk::DepthClampModeEXT::eUserDefinedRange - : vk::DepthClampModeEXT::eViewportRange, - .pDepthClampRange = &depth_clamp_range, - }, + const vk::PipelineViewportStateCreateInfo viewport_info = { + .pNext = instance.IsDepthClipControlSupported() ? &clip_control : nullptr, }; - if (!instance.IsDepthClampControlSupported()) { - viewport_chain.unlink(); - } - if (!instance.IsDepthClipControlSupported()) { - viewport_chain.unlink(); - } - boost::container::static_vector dynamic_states = { vk::DynamicState::eViewportWithCount, vk::DynamicState::eScissorWithCount, vk::DynamicState::eBlendConstants, vk::DynamicState::eDepthTestEnable, @@ -339,7 +323,7 @@ GraphicsPipeline::GraphicsPipeline( .pVertexInputState = !instance.IsVertexInputDynamicState() ? &vertex_input_info : nullptr, .pInputAssemblyState = &input_assembly, .pTessellationState = &tessellation_state, - .pViewportState = &viewport_chain.get(), + .pViewportState = &viewport_info, .pRasterizationState = &raster_chain.get(), .pMultisampleState = &multisampling, .pColorBlendState = &color_blending, diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.h b/src/video_core/renderer_vulkan/vk_graphics_pipeline.h index 1ecfa6b42..75b8c8c73 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.h +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.h @@ -48,9 +48,6 @@ struct GraphicsPipelineKey { Liverpool::DepthBuffer::ZFormat z_format : 2; Liverpool::DepthBuffer::StencilFormat stencil_format : 1; u32 depth_clamp_enable : 1; - u32 depth_clamp_user_defined_range : 1; - float min_depth_clamp; - float max_depth_clamp; }; struct { AmdGpu::PrimitiveType prim_type : 5; diff --git a/src/video_core/renderer_vulkan/vk_instance.cpp b/src/video_core/renderer_vulkan/vk_instance.cpp index 3a461b321..119c0a367 100644 --- a/src/video_core/renderer_vulkan/vk_instance.cpp +++ b/src/video_core/renderer_vulkan/vk_instance.cpp @@ -271,10 +271,14 @@ bool Instance::CreateDevice() { custom_border_color = add_extension(VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME); depth_clip_control = add_extension(VK_EXT_DEPTH_CLIP_CONTROL_EXTENSION_NAME); depth_clip_enable = add_extension(VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME); - depth_clamp_control = add_extension(VK_EXT_DEPTH_CLAMP_CONTROL_EXTENSION_NAME); vertex_input_dynamic_state = add_extension(VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); list_restart = add_extension(VK_EXT_PRIMITIVE_TOPOLOGY_LIST_RESTART_EXTENSION_NAME); - fragment_shader_barycentric = add_extension(VK_KHR_FRAGMENT_SHADER_BARYCENTRIC_EXTENSION_NAME); + amd_shader_explicit_vertex_parameter = + add_extension(VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_EXTENSION_NAME); + if (!amd_shader_explicit_vertex_parameter) { + fragment_shader_barycentric = + add_extension(VK_KHR_FRAGMENT_SHADER_BARYCENTRIC_EXTENSION_NAME); + } legacy_vertex_attributes = add_extension(VK_EXT_LEGACY_VERTEX_ATTRIBUTES_EXTENSION_NAME); provoking_vertex = add_extension(VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME); shader_stencil_export = add_extension(VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME); @@ -426,9 +430,6 @@ bool Instance::CreateDevice() { vk::PhysicalDeviceDepthClipEnableFeaturesEXT{ .depthClipEnable = true, }, - vk::PhysicalDeviceDepthClampControlFeaturesEXT{ - .depthClampControl = true, - }, vk::PhysicalDeviceRobustness2FeaturesEXT{ .robustBufferAccess2 = robustness2_features.robustBufferAccess2, .robustImageAccess2 = robustness2_features.robustImageAccess2, @@ -504,9 +505,6 @@ bool Instance::CreateDevice() { if (!depth_clip_enable) { device_chain.unlink(); } - if (!depth_clamp_control) { - device_chain.unlink(); - } if (!robustness2) { device_chain.unlink(); } diff --git a/src/video_core/renderer_vulkan/vk_instance.h b/src/video_core/renderer_vulkan/vk_instance.h index 67dcc183a..9be2d9520 100644 --- a/src/video_core/renderer_vulkan/vk_instance.h +++ b/src/video_core/renderer_vulkan/vk_instance.h @@ -114,11 +114,6 @@ public: return depth_clip_enable; } - /// Returns true when VK_EXT_depth_clamp_control is supported - bool IsDepthClampControlSupported() const { - return depth_clamp_control; - } - /// Returns true when VK_EXT_depth_range_unrestricted is supported bool IsDepthRangeUnrestrictedSupported() const { return depth_range_unrestricted; @@ -150,6 +145,11 @@ public: return fragment_shader_barycentric; } + /// Returns true when VK_AMD_shader_explicit_vertex_parameter is supported. + bool IsAmdShaderExplicitVertexParameterSupported() const { + return amd_shader_explicit_vertex_parameter; + } + /// Returns true when VK_EXT_primitive_topology_list_restart is supported. bool IsListRestartSupported() const { return list_restart; @@ -418,9 +418,9 @@ private: u32 queue_family_index{0}; bool custom_border_color{}; bool fragment_shader_barycentric{}; + bool amd_shader_explicit_vertex_parameter{}; bool depth_clip_control{}; bool depth_clip_enable{}; - bool depth_clamp_control{}; bool depth_range_unrestricted{}; bool dynamic_state_3{}; bool vertex_input_dynamic_state{}; diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index d9e01091e..4de8fd73b 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -220,6 +220,12 @@ PipelineCache::PipelineCache(const Instance& instance_, Scheduler& scheduler_, .supports_shared_int64_atomics = instance_.IsSharedInt64AtomicsSupported(), .supports_workgroup_explicit_memory_layout = instance_.IsWorkgroupMemoryExplicitLayoutSupported(), + .supports_amd_shader_explicit_vertex_parameter = + instance_.IsAmdShaderExplicitVertexParameterSupported(), + .supports_fragment_shader_barycentric = instance_.IsFragmentShaderBarycentricSupported(), + .has_incomplete_fragment_shader_barycentric = + instance_.IsFragmentShaderBarycentricSupported() && + instance.GetDriverID() == vk::DriverId::eMoltenvk, .needs_manual_interpolation = instance.IsFragmentShaderBarycentricSupported() && instance.GetDriverID() == vk::DriverId::eNvidiaProprietary, .needs_lds_barriers = instance.GetDriverID() == vk::DriverId::eNvidiaProprietary || @@ -290,6 +296,7 @@ bool PipelineCache::RefreshGraphicsKey() { key.stencil_format = regs.depth_buffer.StencilValid() ? regs.depth_buffer.stencil_info.format.Value() : Liverpool::DepthBuffer::StencilFormat::Invalid; + key.depth_clamp_enable = !regs.depth_render_override.disable_viewport_clamp; key.depth_clip_enable = regs.clipper_control.ZclipEnable(); key.clip_space = regs.clipper_control.clip_space; key.provoking_vtx_last = regs.polygon_control.provoking_vtx_last; @@ -298,8 +305,6 @@ bool PipelineCache::RefreshGraphicsKey() { key.logic_op = regs.color_control.rop3; key.num_samples = regs.NumSamples(); - RefreshDepthClampRange(); - const bool skip_cb_binding = regs.color_control.mode == AmdGpu::Liverpool::ColorControl::OperationMode::Disable; @@ -488,62 +493,6 @@ bool PipelineCache::RefreshGraphicsKey() { return true; } -void PipelineCache::RefreshDepthClampRange() { - auto& regs = liverpool->regs; - auto& key = graphics_key; - - key.depth_clamp_enable = !regs.depth_render_override.disable_viewport_clamp; - if (key.z_format == Liverpool::DepthBuffer::ZFormat::Invalid || !key.depth_clamp_enable) { - return; - } - - bool depth_clamp_can_use_viewport_range = true; - bool depth_clamp_is_same_on_all_viewports = true; - float zmin = std::numeric_limits::max(); - float zmax = std::numeric_limits::max(); - const auto& vp_ctl = regs.viewport_control; - for (u32 i = 0; i < Liverpool::NumViewports; i++) { - const auto& vp = regs.viewports[i]; - const auto& vp_d = regs.viewport_depths[i]; - if (vp.xscale == 0) { - continue; - } - const auto zoffset = vp_ctl.zoffset_enable ? vp.zoffset : 0.f; - const auto zscale = vp_ctl.zscale_enable ? vp.zscale : 1.f; - - float min_depth; - float max_depth; - if (regs.clipper_control.clip_space == AmdGpu::Liverpool::ClipSpace::MinusWToW) { - min_depth = zoffset - zscale; - max_depth = zoffset + zscale; - } else { - min_depth = zoffset; - max_depth = zoffset + zscale; - } - if (zmin == std::numeric_limits::max()) { - zmin = vp_d.zmin; - zmax = vp_d.zmax; - } - depth_clamp_is_same_on_all_viewports &= (zmin == vp_d.zmin && zmax == vp_d.zmax); - depth_clamp_can_use_viewport_range &= (min_depth == vp_d.zmin && max_depth == vp_d.zmax); - } - - if (zmin == std::numeric_limits::max()) { - return; - } - - if (!depth_clamp_can_use_viewport_range && !depth_clamp_is_same_on_all_viewports) { - LOG_ERROR(Render_Vulkan, - "Viewport depth clamping configuration cannot be accurately emulated"); - } - - key.depth_clamp_user_defined_range = !depth_clamp_can_use_viewport_range; - if (key.depth_clamp_user_defined_range) { - key.min_depth_clamp = zmin; - key.max_depth_clamp = zmax; - } -} - bool PipelineCache::RefreshComputeKey() { Shader::Backend::Bindings binding{}; const auto& cs_pgm = liverpool->GetCsRegs(); diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.h b/src/video_core/renderer_vulkan/vk_pipeline_cache.h index 405275439..ba3407b48 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.h +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.h @@ -76,8 +76,6 @@ private: bool RefreshGraphicsKey(); bool RefreshComputeKey(); - void RefreshDepthClampRange(); - void DumpShader(std::span code, u64 hash, Shader::Stage stage, size_t perm_idx, std::string_view ext); std::optional> GetShaderPatch(u64 hash, Shader::Stage stage, size_t perm_idx, diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index b6130e873..c5f894b10 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -503,9 +503,13 @@ bool Rasterizer::IsComputeMetaClear(const Pipeline* pipeline) { return false; } + // Most of the time when a metadata is updated with a shader it gets cleared. It means + // we can skip the whole dispatch and update the tracked state instead. Also, it is not + // intended to be consumed and in such rare cases (e.g. HTile introspection, CRAA) we + // will need its full emulation anyways. const auto& info = pipeline->GetStage(Shader::LogicalStage::Compute); - // Assume if a shader reads and writes metas at the same time, it is a copy shader. + // Assume if a shader reads metadata, it is a copy shader. for (const auto& desc : info.buffers) { const VAddr address = desc.GetSharp(info).base_address; if (!desc.IsSpecial() && !desc.is_written && texture_cache.IsMeta(address)) { @@ -513,10 +517,15 @@ bool Rasterizer::IsComputeMetaClear(const Pipeline* pipeline) { } } - // Most of the time when a metadata is updated with a shader it gets cleared. It means - // we can skip the whole dispatch and update the tracked state instead. Also, it is not - // intended to be consumed and in such rare cases (e.g. HTile introspection, CRAA) we - // will need its full emulation anyways. + // Metadata surfaces are tiled and thus need address calculation to be written properly. + // If a shader wants to encode HTILE, for example, from a depth image it will have to compute + // proper tile address from dispatch invocation id. This address calculation contains an xor + // operation so use it as a heuristic for metadata writes that are probably not clears. + if (info.has_bitwise_xor) { + return false; + } + + // Assume if a shader writes metadata without address calculation, it is a clear shader. for (const auto& desc : info.buffers) { const VAddr address = desc.GetSharp(info).base_address; if (!desc.IsSpecial() && desc.is_written && texture_cache.ClearMeta(address)) { diff --git a/src/video_core/texture_cache/image.h b/src/video_core/texture_cache/image.h index 31b67e021..2dbaff053 100644 --- a/src/video_core/texture_cache/image.h +++ b/src/video_core/texture_cache/image.h @@ -27,10 +27,9 @@ enum ImageFlagBits : u32 { CpuDirty = 1 << 1, ///< Contents have been modified from the CPU GpuDirty = 1 << 2, ///< Contents have been modified from the GPU (valid data in buffer cache) Dirty = MaybeCpuDirty | CpuDirty | GpuDirty, - GpuModified = 1 << 3, ///< Contents have been modified from the GPU - Registered = 1 << 6, ///< True when the image is registered - Picked = 1 << 7, ///< Temporary flag to mark the image as picked - MetaRegistered = 1 << 8, ///< True when metadata for this surface is known and registered + GpuModified = 1 << 3, ///< Contents have been modified from the GPU + Registered = 1 << 6, ///< True when the image is registered + Picked = 1 << 7, ///< Temporary flag to mark the image as picked }; DECLARE_ENUM_FLAG_OPERATORS(ImageFlagBits) diff --git a/src/video_core/texture_cache/texture_cache.cpp b/src/video_core/texture_cache/texture_cache.cpp index 723b95892..a6657d8d9 100644 --- a/src/video_core/texture_cache/texture_cache.cpp +++ b/src/video_core/texture_cache/texture_cache.cpp @@ -508,20 +508,16 @@ ImageView& TextureCache::FindRenderTarget(BaseDesc& desc) { UpdateImage(image_id); // Register meta data for this color buffer - if (!(image.flags & ImageFlagBits::MetaRegistered)) { - if (desc.info.meta_info.cmask_addr) { - surface_metas.emplace(desc.info.meta_info.cmask_addr, - MetaDataInfo{.type = MetaDataInfo::Type::CMask}); - image.info.meta_info.cmask_addr = desc.info.meta_info.cmask_addr; - image.flags |= ImageFlagBits::MetaRegistered; - } + if (desc.info.meta_info.cmask_addr) { + surface_metas.emplace(desc.info.meta_info.cmask_addr, + MetaDataInfo{.type = MetaDataInfo::Type::CMask}); + image.info.meta_info.cmask_addr = desc.info.meta_info.cmask_addr; + } - if (desc.info.meta_info.fmask_addr) { - surface_metas.emplace(desc.info.meta_info.fmask_addr, - MetaDataInfo{.type = MetaDataInfo::Type::FMask}); - image.info.meta_info.fmask_addr = desc.info.meta_info.fmask_addr; - image.flags |= ImageFlagBits::MetaRegistered; - } + if (desc.info.meta_info.fmask_addr) { + surface_metas.emplace(desc.info.meta_info.fmask_addr, + MetaDataInfo{.type = MetaDataInfo::Type::FMask}); + image.info.meta_info.fmask_addr = desc.info.meta_info.fmask_addr; } return RegisterImageView(image_id, desc.view_info); @@ -536,15 +532,11 @@ ImageView& TextureCache::FindDepthTarget(BaseDesc& desc) { UpdateImage(image_id); // Register meta data for this depth buffer - if (!(image.flags & ImageFlagBits::MetaRegistered)) { - if (desc.info.meta_info.htile_addr) { - surface_metas.emplace( - desc.info.meta_info.htile_addr, - MetaDataInfo{.type = MetaDataInfo::Type::HTile, - .clear_mask = image.info.meta_info.htile_clear_mask}); - image.info.meta_info.htile_addr = desc.info.meta_info.htile_addr; - image.flags |= ImageFlagBits::MetaRegistered; - } + if (desc.info.meta_info.htile_addr) { + surface_metas.emplace(desc.info.meta_info.htile_addr, + MetaDataInfo{.type = MetaDataInfo::Type::HTile, + .clear_mask = image.info.meta_info.htile_clear_mask}); + image.info.meta_info.htile_addr = desc.info.meta_info.htile_addr; } // If there is a stencil attachment, link depth and stencil. diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index ff8ffb61c..9a9679c0a 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -161,10 +161,12 @@ public: /// Registers an image view for provided image ImageView& RegisterImageView(ImageId image_id, const ImageViewInfo& view_info); + /// Returns true if the specified address is a metadata surface. bool IsMeta(VAddr address) const { return surface_metas.contains(address); } + /// Returns true if a slice of the specified metadata surface has been cleared. bool IsMetaCleared(VAddr address, u32 slice) const { const auto& it = surface_metas.find(address); if (it != surface_metas.end()) { @@ -173,6 +175,7 @@ public: return false; } + /// Clears all slices of the specified metadata surface. bool ClearMeta(VAddr address) { auto it = surface_metas.find(address); if (it != surface_metas.end()) { @@ -182,6 +185,7 @@ public: return false; } + /// Updates the state of a slice of the specified metadata surface. bool TouchMeta(VAddr address, u32 slice, bool is_clear) { auto it = surface_metas.find(address); if (it != surface_metas.end()) {