early-access version 1843

src/video_core/renderer_vulkan/vk_fence_manager.cpp

@@ -34,6 +34,10 @@ bool InnerFence::IsSignaled() const {
     if (is_stubbed) {
         return true;
     }
+    if (scheduler.IsFree(wait_tick)) {
+        return true;
+    }
+    scheduler.Refresh();
     return scheduler.IsFree(wait_tick);
 }
 

src/video_core/renderer_vulkan/vk_rasterizer.cpp

@@ -577,6 +577,13 @@ void RasterizerVulkan::UnmapMemory(VAddr addr, u64 size) {
     pipeline_cache.OnCPUWrite(addr, size);
 }
 
+void RasterizerVulkan::ModifyGPUMemory(GPUVAddr addr, u64 size) {
+    {
+        std::scoped_lock lock{texture_cache.mutex};
+        texture_cache.UnmapGPUMemory(addr, size);
+    }
+}
+
 void RasterizerVulkan::SignalSemaphore(GPUVAddr addr, u32 value) {
     if (!gpu.IsAsync()) {
         gpu_memory.Write<u32>(addr, value);
@@ -597,7 +604,7 @@ void RasterizerVulkan::ReleaseFences() {
     if (!gpu.IsAsync()) {
         return;
     }
-    fence_manager.WaitPendingFences();
+    fence_manager.TryReleasePendingFences();
 }
 
 void RasterizerVulkan::FlushAndInvalidateRegion(VAddr addr, u64 size) {
@@ -658,11 +665,10 @@ void RasterizerVulkan::TickFrame() {
 }
 
 bool RasterizerVulkan::AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Surface& src,
-                                             s32 src_address_offset,
                                              const Tegra::Engines::Fermi2D::Surface& dst,
                                              const Tegra::Engines::Fermi2D::Config& copy_config) {
     std::scoped_lock lock{texture_cache.mutex};
-    texture_cache.BlitImage(dst, src, src_address_offset, copy_config);
+    texture_cache.BlitImage(dst, src, copy_config);
     return true;
 }
 

src/video_core/renderer_vulkan/vk_rasterizer.h

@@ -74,6 +74,7 @@ public:
     void OnCPUWrite(VAddr addr, u64 size) override;
     void SyncGuestHost() override;
     void UnmapMemory(VAddr addr, u64 size) override;
+    void ModifyGPUMemory(GPUVAddr addr, u64 size) override;
     void SignalSemaphore(GPUVAddr addr, u32 value) override;
     void SignalSyncPoint(u32 value) override;
     void ReleaseFences() override;
@@ -83,7 +84,7 @@ public:
     void TiledCacheBarrier() override;
     void FlushCommands() override;
     void TickFrame() override;
-    bool AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Surface& src, s32 src_address_offset,
+    bool AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Surface& src,
                                const Tegra::Engines::Fermi2D::Surface& dst,
                                const Tegra::Engines::Fermi2D::Config& copy_config) override;
     bool AccelerateDisplay(const Tegra::FramebufferConfig& config, VAddr framebuffer_addr,

src/video_core/renderer_vulkan/vk_scheduler.h

@@ -83,6 +83,10 @@ public:
         return master_semaphore->IsFree(tick);
     }
 
+    void Refresh() const noexcept {
+        return master_semaphore->Refresh();
+    }
+
     /// Waits for the given tick to trigger on the GPU.
     void Wait(u64 tick) {
         master_semaphore->Wait(tick);