From dbdc64c6872adc8a38c97d4ab05c26b37477f71c Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 2 Aug 2022 08:42:45 +0200 Subject: [PATCH] early-access version 2887 --- README.md | 2 +- src/core/core_timing.cpp | 39 +++++++++++-------- .../renderer_vulkan/vk_texture_cache.cpp | 9 +++-- 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 98efa6bcc..e4fbc924c 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 2886. +This is the source code for early-access 2887. ## Legal Notice diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index b45c1b918..8d1ee3b51 100755 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -143,13 +143,17 @@ void CoreTiming::ScheduleLoopingEvent(std::chrono::nanoseconds start_time, std::chrono::nanoseconds resched_time, const std::shared_ptr& event_type, std::uintptr_t user_data, bool absolute_time) { - std::scoped_lock scope{basic_lock}; - const auto next_time{absolute_time ? start_time : GetGlobalTimeNs() + start_time}; + { + std::scoped_lock scope{basic_lock}; + const auto next_time{absolute_time ? start_time : GetGlobalTimeNs() + start_time}; - event_queue.emplace_back( - Event{next_time.count(), event_fifo_id++, user_data, event_type, resched_time.count()}); + event_queue.emplace_back( + Event{next_time.count(), event_fifo_id++, user_data, event_type, resched_time.count()}); - std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>()); + std::push_heap(event_queue.begin(), event_queue.end(), std::greater<>()); + } + + event.Set(); } void CoreTiming::UnscheduleEvent(const std::shared_ptr& event_type, @@ -277,20 +281,21 @@ void CoreTiming::ThreadLoop() { paused_set = false; const auto next_time = Advance(); if (next_time) { - // There are more events left in the queue, sleep until the next event. - const auto diff_ns{*next_time - GetGlobalTimeNs().count()}; - if (diff_ns > 0) { - // Only try to sleep if the remaining time is >= 1ms. Take off 500 microseconds - // from the target time to account for possible over-sleeping, and spin the - // remaining. - const auto sleep_time_ns{diff_ns - 500LL * 1'000LL}; - const auto sleep_time_ms{sleep_time_ns / 1'000'000LL}; - if (sleep_time_ms >= 1) { - event.WaitFor(std::chrono::nanoseconds(sleep_time_ns)); + // There are more events left in the queue, wait until the next event. + const auto wait_time = *next_time - GetGlobalTimeNs().count(); + if (wait_time > 0) { + // Assume a timer resolution of 1ms. + static constexpr s64 TimerResolutionNS = 1000000; + + // Sleep in discrete intervals of the timer resolution, and spin the rest. + const auto sleep_time = wait_time - (wait_time % TimerResolutionNS); + if (sleep_time > 0) { + event.WaitFor(std::chrono::nanoseconds(sleep_time)); } - const auto end_time{std::chrono::nanoseconds(*next_time)}; - while (!paused && !event.IsSet() && GetGlobalTimeNs() < end_time) { + while (!paused && !event.IsSet() && GetGlobalTimeNs().count() < *next_time) { + // Yield to reduce thread starvation. + std::this_thread::yield(); } if (event.IsSet()) { diff --git a/src/video_core/renderer_vulkan/vk_texture_cache.cpp b/src/video_core/renderer_vulkan/vk_texture_cache.cpp index 71de9a91c..87f29ee88 100755 --- a/src/video_core/renderer_vulkan/vk_texture_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_texture_cache.cpp @@ -1288,10 +1288,11 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu } Image::Image(TextureCacheRuntime& runtime_, const VideoCommon::NullImageParams& params) - : VideoCommon::ImageBase(params), scheduler{&runtime_.scheduler}, runtime{&runtime_}, - original_image{MakeImage(runtime_.device, info)}, - commit(runtime_.memory_allocator.Commit(original_image, MemoryUsage::DeviceLocal)), - aspect_mask{ImageAspectMask(info.format)} { + : VideoCommon::ImageBase(params), scheduler{&runtime_.scheduler}, runtime{&runtime_} { + info.format = PixelFormat::A8B8G8R8_UNORM; + original_image = MakeImage(runtime_.device, info); + aspect_mask = ImageAspectMask(info.format); + commit = runtime_.memory_allocator.Commit(original_image, MemoryUsage::DeviceLocal); if (runtime->device.HasDebuggingToolAttached()) { original_image.SetObjectNameEXT("NullImage"); }