mirror/pineapple
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

early-access version 2887

Browse source
This commit is contained in:
pineappleEA 2022-08-02 08:42:45 +02:00
parent f23ace47e6
commit dbdc64c687
3 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 2886. This is the source code for early-access 2887.
## Legal Notice ## Legal Notice

29
src/core/core_timing.cpp
View file

@ -143,6 +143,7 @@ void CoreTiming::ScheduleLoopingEvent(std::chrono::nanoseconds start_time,
std::chrono::nanoseconds resched_time, std::chrono::nanoseconds resched_time,
const std::shared_ptr<EventType>& event_type, const std::shared_ptr<EventType>& event_type,
std::uintptr_t user_data, bool absolute_time) { std::uintptr_t user_data, bool absolute_time) {
{
std::scoped_lock scope{basic_lock}; std::scoped_lock scope{basic_lock};
const auto next_time{absolute_time ? start_time : GetGlobalTimeNs() + start_time}; const auto next_time{absolute_time ? start_time : GetGlobalTimeNs() + start_time};
@ -152,6 +153,9 @@ void CoreTiming::ScheduleLoopingEvent(std::chrono::nanoseconds start_time,
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<EventType>& event_type, void CoreTiming::UnscheduleEvent(const std::shared_ptr<EventType>& event_type,
std::uintptr_t user_data) { std::uintptr_t user_data) {
std::scoped_lock scope{basic_lock}; std::scoped_lock scope{basic_lock};
@ -277,20 +281,21 @@ void CoreTiming::ThreadLoop() {
paused_set = false; paused_set = false;
const auto next_time = Advance(); const auto next_time = Advance();
if (next_time) { if (next_time) {
// There are more events left in the queue, sleep until the next event. // There are more events left in the queue, wait until the next event.
const auto diff_ns{*next_time - GetGlobalTimeNs().count()}; const auto wait_time = *next_time - GetGlobalTimeNs().count();
if (diff_ns > 0) { if (wait_time > 0) {
// Only try to sleep if the remaining time is >= 1ms. Take off 500 microseconds // Assume a timer resolution of 1ms.
// from the target time to account for possible over-sleeping, and spin the static constexpr s64 TimerResolutionNS = 1000000;
// remaining.
const auto sleep_time_ns{diff_ns - 500LL * 1'000LL}; // Sleep in discrete intervals of the timer resolution, and spin the rest.
const auto sleep_time_ms{sleep_time_ns / 1'000'000LL}; const auto sleep_time = wait_time - (wait_time % TimerResolutionNS);
if (sleep_time_ms >= 1) { if (sleep_time > 0) {
event.WaitFor(std::chrono::nanoseconds(sleep_time_ns)); event.WaitFor(std::chrono::nanoseconds(sleep_time));
} }
const auto end_time{std::chrono::nanoseconds(*next_time)}; while (!paused && !event.IsSet() && GetGlobalTimeNs().count() < *next_time) {
while (!paused && !event.IsSet() && GetGlobalTimeNs() < end_time) { // Yield to reduce thread starvation.
std::this_thread::yield();
} }
if (event.IsSet()) { if (event.IsSet()) {

9
src/video_core/renderer_vulkan/vk_texture_cache.cpp
View file

@ -1288,10 +1288,11 @@ Image::Image(TextureCacheRuntime& runtime_, const ImageInfo& info_, GPUVAddr gpu
} }
Image::Image(TextureCacheRuntime& runtime_, const VideoCommon::NullImageParams& params) Image::Image(TextureCacheRuntime& runtime_, const VideoCommon::NullImageParams& params)
: VideoCommon::ImageBase(params), scheduler{&runtime_.scheduler}, runtime{&runtime_}, : VideoCommon::ImageBase(params), scheduler{&runtime_.scheduler}, runtime{&runtime_} {
original_image{MakeImage(runtime_.device, info)}, info.format = PixelFormat::A8B8G8R8_UNORM;
commit(runtime_.memory_allocator.Commit(original_image, MemoryUsage::DeviceLocal)), original_image = MakeImage(runtime_.device, info);
aspect_mask{ImageAspectMask(info.format)} { aspect_mask = ImageAspectMask(info.format);
commit = runtime_.memory_allocator.Commit(original_image, MemoryUsage::DeviceLocal);
if (runtime->device.HasDebuggingToolAttached()) { if (runtime->device.HasDebuggingToolAttached()) {
original_image.SetObjectNameEXT("NullImage"); original_image.SetObjectNameEXT("NullImage");
} }