From afb025db67acdf4e7e06b4bd007c9f4ad8ca1e72 Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 11 Aug 2025 15:44:52 -0400 Subject: [PATCH] [cmake] fix sirit regression Signed-off-by: crueter --- externals/CMakeLists.txt | 10 +++++----- src/network/announce_multiplayer_session.cpp | 12 ++++++------ src/shader_recompiler/backend/spirv/emit_spirv.cpp | 4 ++-- .../backend/spirv/emit_spirv_warp.cpp | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index e9f763d3f3..6e5f0d22ab 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -203,15 +203,15 @@ endif() AddPackage( NAME SPIRV-Headers REPO "KhronosGroup/SPIRV-Headers" - SHA 04b76709bf - HASH 954bbc4794bd369c828937c7d4106b6c7bd17a992c672bf1c2a24c128f2bcf1a13295111f47ce4a0fa77641db424359b153dfea2f4e9d19fe64effb29f411c5c + SHA 4e209d3d7e + HASH f48bbe18341ed55ea0fe280dbbbc0a44bf222278de6e716e143ca1e95ca320b06d4d23d6583fbf8d03e1428f3dac8fa00e5b82ddcd6b425e6236d85af09550a4 ) AddPackage( NAME sirit - REPO "yuzu-mirror/sirit" - SHA 4ab79a8c02 - HASH 1eb6de5b9ee8ded578c4d97ef207d71ad29b5dbb50ab6dd7f05b19143e08822e3e37be61dd42f68dff9ed357dbd3b5c6b40ad2b88de656529bc78ce26f8e3666 + REPO "eden-emulator/sirit" + SHA db1f1e8ab5 + HASH 73eb3a042848c63a10656545797e85f40d142009dfb7827384548a385e1e28e1ac72f42b25924ce530d58275f8638554281e884d72f9c7aaf4ed08690a414b05 OPTIONS "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON" SYSTEM_PACKAGE ON diff --git a/src/network/announce_multiplayer_session.cpp b/src/network/announce_multiplayer_session.cpp index 8836524c73..9d86ea378c 100644 --- a/src/network/announce_multiplayer_session.cpp +++ b/src/network/announce_multiplayer_session.cpp @@ -23,13 +23,13 @@ namespace Core { static constexpr std::chrono::seconds announce_time_interval(15); AnnounceMultiplayerSession::AnnounceMultiplayerSession() { -//#ifdef ENABLE_WEB_SERVICE +#ifdef ENABLE_WEB_SERVICE backend = std::make_unique(Settings::values.web_api_url.GetValue(), Settings::values.eden_username.GetValue(), Settings::values.eden_token.GetValue()); -//#else -// backend = std::make_unique(); -//#endif +#else + backend = std::make_unique(); +#endif } WebService::WebResult AnnounceMultiplayerSession::Register() { @@ -156,11 +156,11 @@ bool AnnounceMultiplayerSession::IsRunning() const { void AnnounceMultiplayerSession::UpdateCredentials() { ASSERT_MSG(!IsRunning(), "Credentials can only be updated when session is not running"); -//#ifdef ENABLE_WEB_SERVICE +#ifdef ENABLE_WEB_SERVICE backend = std::make_unique(Settings::values.web_api_url.GetValue(), Settings::values.eden_username.GetValue(), Settings::values.eden_token.GetValue()); -//#endif +#endif } } // namespace Core diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.cpp b/src/shader_recompiler/backend/spirv/emit_spirv.cpp index fde682e234..2ea31b29f4 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp @@ -468,7 +468,7 @@ void SetupCapabilities(const Profile& profile, const Info& info, EmitContext& ct void PatchPhiNodes(IR::Program& program, EmitContext& ctx) { auto inst{program.blocks.front()->begin()}; size_t block_index{0}; - ctx.PatchDeferredPhi([&](size_t phi_arg) -> Id { + ctx.PatchDeferredPhi([&](size_t phi_arg, Id parent) -> std::pair { if (phi_arg == 0) { ++inst; if (inst == program.blocks[block_index]->end() || @@ -479,7 +479,7 @@ void PatchPhiNodes(IR::Program& program, EmitContext& ctx) { } while (inst->GetOpcode() != IR::Opcode::Phi); } } - return ctx.Def(inst->Arg(phi_arg)); + return {ctx.Def(inst->Arg(phi_arg)), parent}; }); } } // Anonymous namespace diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_warp.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_warp.cpp index 74884ab4eb..77ff8c5731 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_warp.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_warp.cpp @@ -70,7 +70,7 @@ Id GetMaxThreadId(EmitContext& ctx, Id thread_id, Id clamp, Id segmentation_mask Id SelectValue(EmitContext& ctx, Id in_range, Id value, Id src_thread_id) { return ctx.OpSelect( ctx.U32[1], in_range, - ctx.OpGroupNonUniformShuffleXor(ctx.U32[1], SubgroupScope(ctx), value, src_thread_id), value); + ctx.OpGroupNonUniformShuffle(ctx.U32[1], SubgroupScope(ctx), value, src_thread_id), value); } Id AddPartitionBase(EmitContext& ctx, Id thread_id) {