eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 59 Projects 1 Releases Packages Wiki Activity Actions

[cmake] fix sirit regression
All checks were successful
eden-license / license-header (pull_request) Successful in 24s
Details

Browse source 
Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-08-11 15:44:52 -04:00
parent 5049d8189e
commit afb025db67
4 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
externals/CMakeLists.txt vendored
View file

@ -203,15 +203,15 @@ endif()
AddPackage( AddPackage(
NAME SPIRV-Headers NAME SPIRV-Headers
REPO "KhronosGroup/SPIRV-Headers" REPO "KhronosGroup/SPIRV-Headers"
SHA 04b76709bf SHA 4e209d3d7e
HASH 954bbc4794bd369c828937c7d4106b6c7bd17a992c672bf1c2a24c128f2bcf1a13295111f47ce4a0fa77641db424359b153dfea2f4e9d19fe64effb29f411c5c HASH f48bbe18341ed55ea0fe280dbbbc0a44bf222278de6e716e143ca1e95ca320b06d4d23d6583fbf8d03e1428f3dac8fa00e5b82ddcd6b425e6236d85af09550a4
) )
AddPackage( AddPackage(
NAME sirit NAME sirit
REPO "yuzu-mirror/sirit" REPO "eden-emulator/sirit"
SHA 4ab79a8c02 SHA db1f1e8ab5
HASH 1eb6de5b9ee8ded578c4d97ef207d71ad29b5dbb50ab6dd7f05b19143e08822e3e37be61dd42f68dff9ed357dbd3b5c6b40ad2b88de656529bc78ce26f8e3666 HASH 73eb3a042848c63a10656545797e85f40d142009dfb7827384548a385e1e28e1ac72f42b25924ce530d58275f8638554281e884d72f9c7aaf4ed08690a414b05
OPTIONS OPTIONS
"SIRIT_USE_SYSTEM_SPIRV_HEADERS ON" "SIRIT_USE_SYSTEM_SPIRV_HEADERS ON"
SYSTEM_PACKAGE ON SYSTEM_PACKAGE ON

12
src/network/announce_multiplayer_session.cpp
View file

@ -23,13 +23,13 @@ namespace Core {
static constexpr std::chrono::seconds announce_time_interval(15); static constexpr std::chrono::seconds announce_time_interval(15);
AnnounceMultiplayerSession::AnnounceMultiplayerSession() { AnnounceMultiplayerSession::AnnounceMultiplayerSession() {
//#ifdef ENABLE_WEB_SERVICE #ifdef ENABLE_WEB_SERVICE
backend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url.GetValue(), backend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url.GetValue(),
Settings::values.eden_username.GetValue(), Settings::values.eden_username.GetValue(),
Settings::values.eden_token.GetValue()); Settings::values.eden_token.GetValue());
//#else #else
// backend = std::make_unique<AnnounceMultiplayerRoom::NullBackend>(); backend = std::make_unique<AnnounceMultiplayerRoom::NullBackend>();
//#endif #endif
} }
WebService::WebResult AnnounceMultiplayerSession::Register() { WebService::WebResult AnnounceMultiplayerSession::Register() {
@ -156,11 +156,11 @@ bool AnnounceMultiplayerSession::IsRunning() const {
void AnnounceMultiplayerSession::UpdateCredentials() { void AnnounceMultiplayerSession::UpdateCredentials() {
ASSERT_MSG(!IsRunning(), "Credentials can only be updated when session is not running"); 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<WebService::RoomJson>(Settings::values.web_api_url.GetValue(), backend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url.GetValue(),
Settings::values.eden_username.GetValue(), Settings::values.eden_username.GetValue(),
Settings::values.eden_token.GetValue()); Settings::values.eden_token.GetValue());
//#endif #endif
} }
} // namespace Core } // namespace Core

4
src/shader_recompiler/backend/spirv/emit_spirv.cpp
View file

@ -468,7 +468,7 @@ void SetupCapabilities(const Profile& profile, const Info& info, EmitContext& ct
void PatchPhiNodes(IR::Program& program, EmitContext& ctx) { void PatchPhiNodes(IR::Program& program, EmitContext& ctx) {
auto inst{program.blocks.front()->begin()}; auto inst{program.blocks.front()->begin()};
size_t block_index{0}; size_t block_index{0};
ctx.PatchDeferredPhi([&](size_t phi_arg) -> Id { ctx.PatchDeferredPhi([&](size_t phi_arg, Id parent) -> std::pair<Id, Id> {
if (phi_arg == 0) { if (phi_arg == 0) {
++inst; ++inst;
if (inst == program.blocks[block_index]->end() || if (inst == program.blocks[block_index]->end() ||
@ -479,7 +479,7 @@ void PatchPhiNodes(IR::Program& program, EmitContext& ctx) {
} while (inst->GetOpcode() != IR::Opcode::Phi); } while (inst->GetOpcode() != IR::Opcode::Phi);
} }
} }
return ctx.Def(inst->Arg(phi_arg)); return {ctx.Def(inst->Arg(phi_arg)), parent};
}); });
} }
} // Anonymous namespace } // Anonymous namespace

2
src/shader_recompiler/backend/spirv/emit_spirv_warp.cpp
View file

@ -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) { Id SelectValue(EmitContext& ctx, Id in_range, Id value, Id src_thread_id) {
return ctx.OpSelect( return ctx.OpSelect(
ctx.U32[1], in_range, 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) { Id AddPartitionBase(EmitContext& ctx, Id thread_id) {