From 2d2e9208d23e12cf7b6baec394422b0e9830c202 Mon Sep 17 00:00:00 2001 From: MrPurple666 Date: Fri, 28 Mar 2025 02:45:35 -0300 Subject: [PATCH] Unified torzu and sudachi friend.cpp + fix android build on dma_pusher --- src/core/hle/service/friend/friend.cpp | 16 +++------------- src/video_core/dma_pusher.cpp | 6 ++++++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/src/core/hle/service/friend/friend.cpp b/src/core/hle/service/friend/friend.cpp index 4aa92a9f47..794c54c211 100644 --- a/src/core/hle/service/friend/friend.cpp +++ b/src/core/hle/service/friend/friend.cpp @@ -278,25 +278,15 @@ private: rb.Push(0); } - void GetUserPresenceView(HLERequestContext& ctx) { - LOG_DEBUG(Service_Friend, "(STUBBED) called"); - - u8 buf[0xe0]{}; - ctx.WriteBuffer(buf); - - IPC::ResponseBuilder rb{ctx, 3}; - rb.Push(ResultSuccess); - } - void GetUserPresenceView(HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; const auto uuid = rp.PopRaw(); - LOG_DEBUG(Service_Friend, "(STUBBED) called, uuid={}.", uuid.RawString()); - // TODO (jarrodnorwell) + u8 buf[0xe0]{}; + ctx.WriteBuffer(buf); - IPC::ResponseBuilder rb{ctx, 2}; + IPC::ResponseBuilder rb{ctx, 3}; rb.Push(ResultSuccess); } diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp index aaacccfa90..401329eea0 100644 --- a/src/video_core/dma_pusher.cpp +++ b/src/video_core/dma_pusher.cpp @@ -15,6 +15,12 @@ namespace Tegra { constexpr u32 MacroRegistersStart = 0xE00; constexpr u32 ComputeInline = 0x6D; +//start on PR#76 of Eden this is a unused variable in android (need to investigate) + +// Dummy function that uses ComputeInline +constexpr void UseComputeInline() { + static_cast(ComputeInline); // Suppress unused variable error +} DmaPusher::DmaPusher(Core::System& system_, GPU& gpu_, MemoryManager& memory_manager_, Control::ChannelState& channel_state_)