VERY experimental Nintendo Switch 2 emulator
C++
[vk, nvnflinger] Fix RDNA3 gloom + purple lines & reapply adjustrefcount unstubb (#152)
Maufeate4953d5866ca
diff --git a/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvnflinger/buffer_queue_producer.cppindex 4317aee1c4..1bb88a45fa 100644--- a/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp+++ b/src/core/hle/service/nvnflinger/buffer_queue_producer.cpp@@ -728,22 +728,26 @@ Status BufferQueueProducer::Connect(const std::shared_ptr<IProducerListener>& lireturn status;}+// https://android.googlesource.com/platform/frameworks/native/%2B/master/libs/gui/BufferQueueProducer.cpp#1457Status BufferQueueProducer::Disconnect(NativeWindowApi api) {- LOG_DEBUG(Service_Nvnflinger, "api = {}", api);+ LOG_DEBUG(Service_Nvnflinger, "disconnect api = {}", api);- Status status = Status::NoError;std::shared_ptr<IConsumerListener> listener;+ Status status = Status::NoError;{std::scoped_lock lock{core->mutex};-core->WaitWhileAllocatingLocked();if (core->is_abandoned) {- // Disconnecting after the surface has been abandoned is a no-op.return Status::NoError;}+ if (core->connected_api == NativeWindowApi::NoConnectedApi) {+ LOG_DEBUG(Service_Nvnflinger, "disconnect: not connected (req = {})", api);+ return Status::NoInit;+ }+switch (api) {case NativeWindowApi::Egl:case NativeWindowApi::Cpu:@@ -758,20 +762,20 @@ Status BufferQueueProducer::Disconnect(NativeWindowApi api) {buffer_wait_event->Signal();listener = core->consumer_listener;} else {- LOG_ERROR(Service_Nvnflinger, "still connected to another api (cur = {} req = {})",+ LOG_ERROR(Service_Nvnflinger,+ "disconnect: still connected to another api (cur = {} req = {})",core->connected_api, api);status = Status::BadValue;}break;default:- LOG_ERROR(Service_Nvnflinger, "unknown api = {}", api);+ LOG_ERROR(Service_Nvnflinger, "disconnect: unknown api = {}", api);status = Status::BadValue;break;}}- // Call back without lock held- if (listener != nullptr) {+ if (listener) {listener->OnBuffersReleased();}diff --git a/src/core/hle/service/nvnflinger/hos_binder_driver.cpp b/src/core/hle/service/nvnflinger/hos_binder_driver.cppindex 8629a2e89b..d30aa3717d 100644--- a/src/core/hle/service/nvnflinger/hos_binder_driver.cpp+++ b/src/core/hle/service/nvnflinger/hos_binder_driver.cpp@@ -40,17 +40,22 @@ Result IHOSBinderDriver::TransactParcel(s32 binder_id, u32 transaction_id,}Result IHOSBinderDriver::AdjustRefcount(s32 binder_id, s32 addval, s32 type) {- LOG_WARNING(Service_VI, "(STUBBED) called id={}, addval={}, type={}", binder_id, addval, type);+ LOG_DEBUG(Service_VI, "called id={}, addval={}, type={}", binder_id, addval, type);+ R_UNLESS(type == 0 || type == 1, ResultUnknown);+ m_server->AdjustRefcount(binder_id, addval, type == 1);R_SUCCEED();}Result IHOSBinderDriver::GetNativeHandle(s32 binder_id, u32 type_id,OutCopyHandle<Kernel::KReadableEvent> out_handle) {- LOG_WARNING(Service_VI, "(STUBBED) called id={}, type_id={}", binder_id, type_id);+ LOG_DEBUG(Service_VI, "called id={}, type_id={}", binder_id, type_id);const auto binder = m_server->TryGetBinder(binder_id);R_UNLESS(binder != nullptr, ResultUnknown);+ auto native_handle = binder->GetNativeHandle(type_id);+ R_UNLESS(native_handle != nullptr, ResultUnknown);+*out_handle = binder->GetNativeHandle(type_id);R_SUCCEED();diff --git a/src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp b/src/core/hle/service/nvnflinger/hos_binder_driver_server.cppindex 29addda44d..b85f1a4fa4 100644--- a/src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp+++ b/src/core/hle/service/nvnflinger/hos_binder_driver_server.cpp@@ -17,6 +17,7 @@ s32 HosBinderDriverServer::RegisterBinder(std::shared_ptr<android::IBinder>&& bilast_id++;binders[last_id] = std::move(binder);+ refcounts[last_id] = {}; // strong = 1, weak = 0return last_id;}@@ -25,6 +26,29 @@ void HosBinderDriverServer::UnregisterBinder(s32 binder_id) {std::scoped_lock lk{lock};binders.erase(binder_id);+ refcounts.erase(binder_id);+}++void HosBinderDriverServer::AdjustRefcount(s32 binder_id, s32 delta, bool is_weak) {+ std::scoped_lock lk{lock};++ auto search_rc = refcounts.find(binder_id);+ if (search_rc == refcounts.end()) {+ LOG_WARNING(Service_VI, "AdjustRefcount called for unknown binder id {}", binder_id);+ return;+ }++ auto& rc = search_rc->second;+ s32& counter = is_weak ? rc.weak : rc.strong;+ counter += delta;++ if (counter < 0)+ counter = 0;++ if (rc.strong == 0 && rc.weak == 0) {+ binders.erase(binder_id);+ refcounts.erase(search_rc);+ }}std::shared_ptr<android::IBinder> HosBinderDriverServer::TryGetBinder(s32 id) const {diff --git a/src/core/hle/service/nvnflinger/hos_binder_driver_server.h b/src/core/hle/service/nvnflinger/hos_binder_driver_server.hindex d72b50833d..f4b4060115 100644--- a/src/core/hle/service/nvnflinger/hos_binder_driver_server.h+++ b/src/core/hle/service/nvnflinger/hos_binder_driver_server.h@@ -26,10 +26,18 @@ public:std::shared_ptr<android::IBinder> TryGetBinder(s32 id) const;+ void AdjustRefcount(s32 binder_id, s32 delta, bool is_weak);+private:- std::unordered_map<s32, std::shared_ptr<android::IBinder>> binders;+ struct RefCounts {+ s32 strong{1};+ s32 weak{0};+ };+mutable std::mutex lock;- s32 last_id{};+ s32 last_id = 0;+ std::unordered_map<s32, std::shared_ptr<android::IBinder>> binders;+ std::unordered_map<s32, RefCounts> refcounts;};} // namespace Service::Nvnflingerdiff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cppindex c05e21a2c8..5d80531b47 100644--- a/src/video_core/vulkan_common/vulkan_wrapper.cpp+++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp@@ -440,13 +440,14 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char#elseconstexpr VkFlags ci_flags{};#endif-+ // DO NOT TOUCH, breaks RNDA3!!+ // Don't know why, but gloom + yellow line glitch appearsconst VkApplicationInfo application_info{.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,.pNext = nullptr,.pApplicationName = "yuzu Emulator",.applicationVersion = VK_MAKE_VERSION(1, 3, 0),- .pEngineName = "Eden Emulator",+ .pEngineName = "yuzu Emulator",.engineVersion = VK_MAKE_VERSION(1, 3, 0),.apiVersion = VK_API_VERSION_1_3,};