VERY experimental Nintendo Switch 2 emulator
C++
revert [android] Snapdragon 865 patches (#23)
CamilleLaVeycd394fc40f38
diff --git a/src/common/microprofile.h b/src/common/microprofile.hindex 25bf362500..56ef0a2dcf 100644--- a/src/common/microprofile.h+++ b/src/common/microprofile.h@@ -1,21 +1,11 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project-// SPDX-License-Identifier: GPL-3.0-or-later-// SPDX-FileCopyrightText: 2015 Citra Emulator Project// SPDX-License-Identifier: GPL-2.0-or-later#pragma once-// Use this to disable microprofile. This will get you cleaner profiles when using+// Uncomment this to disable microprofile. This will get you cleaner profiles when using// external sampling profilers like "Very Sleepy", and will improve performance somewhat.-#ifdef ANDROID-#define MICROPROFILE_ENABLED 0-#define MICROPROFILEUI_ENABLED 0-#define MicroProfileOnThreadExit() do{}while(0)-#define MICROPROFILE_TOKEN(x) 0-#define MicroProfileEnter(x) 0-#define MicroProfileLeave(x, y) ignore_all(x, y)-#endif+// #define MICROPROFILE_ENABLED 0// Customized Citra settings.// This file wraps the MicroProfile header so that these are consistent everywhere.@@ -29,12 +19,6 @@typedef void* HANDLE;#endif-#include <tuple>-template <typename... Args>-void ignore_all(Args&&... args) {- (static_cast<void>(std::ignore = args), ...);-}-#include <microprofile.h>#define MP_RGB(r, g, b) ((r) << 16 | (g) << 8 | (b) << 0)diff --git a/src/core/arm/nce/arm_nce.cpp b/src/core/arm/nce/arm_nce.cppindex 0e0d72fc8a..877e8ac3c7 100644--- a/src/core/arm/nce/arm_nce.cpp+++ b/src/core/arm/nce/arm_nce.cpp@@ -227,7 +227,7 @@ HaltReason ArmNce::RunThread(Kernel::KThread* thread) {if (auto it = post_handlers.find(m_guest_ctx.pc); it != post_handlers.end()) {hr = ReturnToRunCodeByTrampoline(thread_params, &m_guest_ctx, it->second);} else {- hr = ReturnToRunCodeByExceptionLevelChange(m_thread_id, thread_params); // Android: Use "process handle SIGUSR2 -n true -p true -s false" (and SIGURG) in LLDB when debugging+ hr = ReturnToRunCodeByExceptionLevelChange(m_thread_id, thread_params);}// Critical section for thread cleanupdiff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cppindex d9f01a65b8..b07bd3e58e 100644--- a/src/core/hle/service/sockets/sfdnsres.cpp+++ b/src/core/hle/service/sockets/sfdnsres.cpp@@ -53,16 +53,6 @@ enum class NetDbError : s32 {NoData = 4,};-const std::vector<std::string> blockedDomains = {"srv.nintendo.net", "battle.net",- "microsoft.com", "mojang.com",- "xboxlive.com", "minecraftservices.com"};--static bool IsBlockedHost(const std::string& host) {- return std::any_of(- blockedDomains.begin(), blockedDomains.end(),- [&host](const std::string& domain) { return host.find(domain) != std::string::npos; });-}-static NetDbError GetAddrInfoErrorToNetDbError(GetAddrInfoError result) {// These combinations have been verified on console (but are not// exhaustive).@@ -164,7 +154,7 @@ static std::pair<u32, GetAddrInfoError> GetHostByNameRequestImpl(HLERequestConte// For now, ignore options, which are in input buffer 1 for GetHostByNameRequestWithOptions.// Prevent resolution of Nintendo servers- if (IsBlockedHost(host)) {+ if (host.find("srv.nintendo.net") != std::string::npos) {LOG_WARNING(Network, "Resolution of hostname {} requested, returning EAI_AGAIN", host);return {0, GetAddrInfoError::AGAIN};}@@ -281,7 +271,7 @@ static std::pair<u32, GetAddrInfoError> GetAddrInfoRequestImpl(HLERequestContextconst std::string host = Common::StringFromBuffer(host_buffer);// Prevent resolution of Nintendo servers- if (IsBlockedHost(host)) {+ if (host.find("srv.nintendo.net") != std::string::npos) {LOG_WARNING(Network, "Resolution of hostname {} requested, returning EAI_AGAIN", host);return {0, GetAddrInfoError::AGAIN};}@@ -369,4 +359,5 @@ void SFDNSRES::ResolverSetOptionRequest(HLERequestContext& ctx) {rb.Push(ResultSuccess);rb.Push<s32>(0); // bsd errno}+} // namespace Service::Socketsdiff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/warp_shuffle.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/warp_shuffle.cppindex b904821619..972eec8276 100644--- a/src/shader_recompiler/frontend/maxwell/translate/impl/warp_shuffle.cpp+++ b/src/shader_recompiler/frontend/maxwell/translate/impl/warp_shuffle.cpp@@ -7,7 +7,6 @@#include "common/bit_field.h"#include "common/common_types.h"#include "shader_recompiler/frontend/maxwell/translate/impl/impl.h"-#include <fstream>namespace Shader::Maxwell {namespace {@@ -37,17 +36,6 @@ enum class ShuffleMode : u64 {}}-bool IsKONA() {- std::ifstream machineFile("/sys/devices/soc0/machine");- if (machineFile.is_open()) {- std::string line;- std::getline(machineFile, line);- if (line == "KONA")- return true;- }- return false;-}-void Shuffle(TranslatorVisitor& v, u64 insn, const IR::U32& index, const IR::U32& mask) {union {u64 insn;@@ -59,10 +47,7 @@ void Shuffle(TranslatorVisitor& v, u64 insn, const IR::U32& index, const IR::U32const IR::U32 result{ShuffleOperation(v.ir, v.X(shfl.src_reg), index, mask, shfl.mode)};v.ir.SetPred(shfl.pred, v.ir.GetInBoundsFromOp(result));- if (IsKONA())- v.X(shfl.dest_reg, v.ir.Imm32(0xffffffff)); // This fixes the freeze for Retroid / Snapdragon SD865- else- v.X(shfl.dest_reg, result);+ v.X(shfl.dest_reg, result);}} // Anonymous namespacediff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.hindex e134e26e66..0ce2abc627 100644--- a/src/video_core/buffer_cache/buffer_cache.h+++ b/src/video_core/buffer_cache/buffer_cache.h@@ -26,9 +26,7 @@ BufferCache<P>::BufferCache(Tegra::MaxwellDeviceMemoryManager& device_memory_, Rvoid(slot_buffers.insert(runtime, NullBufferParams{}));gpu_modified_ranges.Clear();inline_buffer_id = NULL_BUFFER_ID;-#ifdef ANDROID- immediately_free = (Settings::values.vram_usage_mode.GetValue() == Settings::VramUsageMode::Aggressive);-#endif+if (!runtime.CanReportMemoryUsage()) {minimum_memory = DEFAULT_EXPECTED_MEMORY;critical_memory = DEFAULT_CRITICAL_MEMORY;@@ -1385,8 +1383,6 @@ void BufferCache<P>::JoinOverlap(BufferId new_buffer_id, BufferId overlap_id,});new_buffer.MarkUsage(copies[0].dst_offset, copies[0].size);runtime.CopyBuffer(new_buffer, overlap, copies, true);- if (immediately_free)- runtime.Finish();DeleteBuffer(overlap_id, true);}@@ -1678,9 +1674,7 @@ void BufferCache<P>::DeleteBuffer(BufferId buffer_id, bool do_not_mark) {}Unregister(buffer_id);-- if (!do_not_mark || !immediately_free)- delayed_destruction_ring.Push(std::move(slot_buffers[buffer_id]));+ delayed_destruction_ring.Push(std::move(slot_buffers[buffer_id]));slot_buffers.erase(buffer_id);if constexpr (HAS_PERSISTENT_UNIFORM_BUFFER_BINDINGS) {diff --git a/src/video_core/buffer_cache/buffer_cache_base.h b/src/video_core/buffer_cache/buffer_cache_base.hindex dbe44c875f..d45f595ea8 100644--- a/src/video_core/buffer_cache/buffer_cache_base.h+++ b/src/video_core/buffer_cache/buffer_cache_base.h@@ -159,11 +159,7 @@ template <class P>class BufferCache : public VideoCommon::ChannelSetupCaches<BufferCacheChannelInfo> {// Page size for caching purposes.// This is unrelated to the CPU page size and it can be changed as it seems optimal.-#ifdef ANDROID- static constexpr u32 CACHING_PAGEBITS = 12;-#elsestatic constexpr u32 CACHING_PAGEBITS = 16;-#endifstatic constexpr u64 CACHING_PAGESIZE = u64{1} << CACHING_PAGEBITS;static constexpr bool IS_OPENGL = P::IS_OPENGL;@@ -177,15 +173,9 @@ class BufferCache : public VideoCommon::ChannelSetupCaches<BufferCacheChannelInfstatic constexpr bool SEPARATE_IMAGE_BUFFERS_BINDINGS = P::SEPARATE_IMAGE_BUFFER_BINDINGS;static constexpr bool USE_MEMORY_MAPS_FOR_UPLOADS = P::USE_MEMORY_MAPS_FOR_UPLOADS;-#ifdef ANDROID- static constexpr s64 DEFAULT_EXPECTED_MEMORY = 512_MiB;- static constexpr s64 DEFAULT_CRITICAL_MEMORY = 1_GiB;- static constexpr s64 TARGET_THRESHOLD = 3_GiB;-#elsestatic constexpr s64 DEFAULT_EXPECTED_MEMORY = 512_MiB;static constexpr s64 DEFAULT_CRITICAL_MEMORY = 1_GiB;static constexpr s64 TARGET_THRESHOLD = 4_GiB;-#endif// Debug Flags.@@ -461,12 +451,7 @@ private:Tegra::MaxwellDeviceMemoryManager& device_memory;Common::SlotVector<Buffer> slot_buffers;-#ifdef ANDROID- static constexpr size_t TICKS_TO_DESTROY = 6;-#else- static constexpr size_t TICKS_TO_DESTROY = 8;-#endif- DelayedDestructionRing<Buffer, TICKS_TO_DESTROY> delayed_destruction_ring;+ DelayedDestructionRing<Buffer, 8> delayed_destruction_ring;const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect{};@@ -498,7 +483,6 @@ private:u64 minimum_memory = 0;u64 critical_memory = 0;BufferId inline_buffer_id;- bool immediately_free = false;std::array<BufferId, ((1ULL << 34) >> CACHING_PAGEBITS)> page_table;Common::ScratchBuffer<u8> tmp_buffer;diff --git a/src/video_core/host1x/host1x.cpp b/src/video_core/host1x/host1x.cppindex 652d387031..293bca6d79 100644--- a/src/video_core/host1x/host1x.cpp+++ b/src/video_core/host1x/host1x.cpp@@ -1,6 +1,3 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project-// SPDX-License-Identifier: GPL-3.0-or-later-// SPDX-FileCopyrightText: 2021 yuzu Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later@@ -21,11 +18,9 @@ Host1x::~Host1x() = default;void Host1x::StartDevice(s32 fd, ChannelType type, u32 syncpt) {switch (type) {case ChannelType::NvDec:- std::call_once(nvdec_first_init, []() {std::this_thread::sleep_for(std::chrono::milliseconds{500});}); // HACK: For Astroneerdevices[fd] = std::make_unique<Tegra::Host1x::Nvdec>(*this, fd, syncpt, frame_queue);break;case ChannelType::VIC:- std::call_once(vic_first_init, []() {std::this_thread::sleep_for(std::chrono::milliseconds{500});}); // HACK: For Astroneerdevices[fd] = std::make_unique<Tegra::Host1x::Vic>(*this, fd, syncpt, frame_queue);break;default:diff --git a/src/video_core/host1x/host1x.h b/src/video_core/host1x/host1x.hindex 5ecffa442c..8debac93dd 100644--- a/src/video_core/host1x/host1x.h+++ b/src/video_core/host1x/host1x.h@@ -1,6 +1,3 @@-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project-// SPDX-License-Identifier: GPL-3.0-or-later-// SPDX-FileCopyrightText: 2021 yuzu Emulator Project// SPDX-License-Identifier: GPL-3.0-or-later@@ -204,8 +201,6 @@ private:std::unique_ptr<Common::FlatAllocator<u32, 0, 32>> allocator;FrameQueue frame_queue;std::unordered_map<s32, std::unique_ptr<CDmaPusher>> devices;- std::once_flag nvdec_first_init;- std::once_flag vic_first_init;};} // namespace Tegra::Host1xdiff --git a/src/video_core/texture_cache/texture_cache_base.h b/src/video_core/texture_cache/texture_cache_base.hindex 3f67828b86..cbc27344b0 100644--- a/src/video_core/texture_cache/texture_cache_base.h+++ b/src/video_core/texture_cache/texture_cache_base.h@@ -110,17 +110,10 @@ class TextureCache : public VideoCommon::ChannelSetupCaches<TextureCacheChannelIstatic constexpr size_t UNSET_CHANNEL{std::numeric_limits<size_t>::max()};- #ifdef ANDROID- static constexpr s64 TARGET_THRESHOLD = 3_GiB;- static constexpr s64 DEFAULT_EXPECTED_MEMORY = 1_GiB + 125_MiB;- static constexpr s64 DEFAULT_CRITICAL_MEMORY = 1_GiB + 625_MiB;- static constexpr size_t GC_EMERGENCY_COUNTS = 2;- #elsestatic constexpr s64 TARGET_THRESHOLD = 4_GiB;static constexpr s64 DEFAULT_EXPECTED_MEMORY = 1_GiB + 125_MiB;static constexpr s64 DEFAULT_CRITICAL_MEMORY = 1_GiB + 625_MiB;static constexpr size_t GC_EMERGENCY_COUNTS = 2;- #endifusing Runtime = typename P::Runtime;using Image = typename P::Image;@@ -486,11 +479,7 @@ private:};Common::LeastRecentlyUsedCache<LRUItemParams> lru_cache;- #ifdef ANDROID- static constexpr size_t TICKS_TO_DESTROY = 6;- #elsestatic constexpr size_t TICKS_TO_DESTROY = 8;-#endifDelayedDestructionRing<Image, TICKS_TO_DESTROY> sentenced_images;DelayedDestructionRing<ImageView, TICKS_TO_DESTROY> sentenced_image_view;DelayedDestructionRing<Framebuffer, TICKS_TO_DESTROY> sentenced_framebuffers;diff --git a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp b/src/video_core/vulkan_common/vulkan_memory_allocator.cppindex 04b362f9b0..e80808621b 100644--- a/src/video_core/vulkan_common/vulkan_memory_allocator.cpp+++ b/src/video_core/vulkan_common/vulkan_memory_allocator.cpp@@ -271,10 +271,7 @@ vk::Buffer MemoryAllocator::CreateBuffer(const VkBufferCreateInfo& ci, MemoryUsaVmaAllocation allocation{};VkMemoryPropertyFlags property_flags{};- VkResult result = vmaCreateBuffer(allocator, &ci, &alloc_ci, &handle, &allocation, &alloc_info);- if (result == VK_ERROR_OUT_OF_DEVICE_MEMORY) {- LOG_ERROR(Render_Vulkan, "Out of memory creating buffer (size: {})", ci.size);- }+ vk::Check(vmaCreateBuffer(allocator, &ci, &alloc_ci, &handle, &allocation, &alloc_info));vmaGetAllocationMemoryProperties(allocator, allocation, &property_flags);u8* data = reinterpret_cast<u8*>(alloc_info.pMappedData);