hugopeixoto/yuzu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7127 from FernandoS27/i-saw-a-wabbit

Browse Source 
A few fixes on Vulkan and Rasterizer Caching
This commit is contained in:
Ameer J 2021-10-16 21:37:43 -04:00 committed by GitHub
commit 5b735a4c9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_core/rasterizer_accelerated.h
View File

@ -42,7 +42,7 @@ private:
}; };
static_assert(sizeof(CacheEntry) == 8, "CacheEntry should be 8 bytes!"); static_assert(sizeof(CacheEntry) == 8, "CacheEntry should be 8 bytes!");
std::array<CacheEntry, 0x1000000> cached_pages; std::array<CacheEntry, 0x2000000> cached_pages;
Core::Memory::Memory& cpu_memory; Core::Memory::Memory& cpu_memory;
}; };

17
src/video_core/renderer_vulkan/vk_master_semaphore.h
View File

@ -21,12 +21,12 @@ public:
/// Returns the current logical tick. /// Returns the current logical tick.
[[nodiscard]] u64 CurrentTick() const noexcept { [[nodiscard]] u64 CurrentTick() const noexcept {
return current_tick.load(std::memory_order_relaxed); return current_tick.load(std::memory_order_acquire);
} }
/// Returns the last known GPU tick. /// Returns the last known GPU tick.
[[nodiscard]] u64 KnownGpuTick() const noexcept { [[nodiscard]] u64 KnownGpuTick() const noexcept {
return gpu_tick.load(std::memory_order_relaxed); return gpu_tick.load(std::memory_order_acquire);
} }
/// Returns the timeline semaphore handle. /// Returns the timeline semaphore handle.
@ -41,12 +41,21 @@ public:
/// Advance to the logical tick and return the old one /// Advance to the logical tick and return the old one
[[nodiscard]] u64 NextTick() noexcept { [[nodiscard]] u64 NextTick() noexcept {
return current_tick.fetch_add(1, std::memory_order::relaxed); return current_tick.fetch_add(1, std::memory_order_release);
} }
/// Refresh the known GPU tick /// Refresh the known GPU tick
void Refresh() { void Refresh() {
gpu_tick.store(semaphore.GetCounter(), std::memory_order_relaxed); u64 this_tick{};
u64 counter{};
do {
this_tick = gpu_tick.load(std::memory_order_acquire);
counter = semaphore.GetCounter();
if (counter < this_tick) {
return;
}
} while (!gpu_tick.compare_exchange_weak(this_tick, counter, std::memory_order_release,
std::memory_order_relaxed));
} }
/// Waits for a tick to be hit on the GPU /// Waits for a tick to be hit on the GPU