diff options
| author | 2022-01-01 22:03:37 +0100 | |
|---|---|---|
| committer | 2022-10-06 21:00:52 +0200 | |
| commit | f350c3d74ea7880fc6d21f7f638b0d4a70a3246b (patch) | |
| tree | 30927fa3c736f5b758a0a971a2d95114d8f8d5fa /src/video_core/renderer_vulkan | |
| parent | Texture cache: Fix dangling references on multichannel. (diff) | |
| download | yuzu-f350c3d74ea7880fc6d21f7f638b0d4a70a3246b.tar.gz yuzu-f350c3d74ea7880fc6d21f7f638b0d4a70a3246b.tar.xz yuzu-f350c3d74ea7880fc6d21f7f638b0d4a70a3246b.zip | |
Texture cache: Fix the remaining issues with memory mnagement and unmapping.
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_rasterizer.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_rasterizer.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 7e0805544..50fdf5e18 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp | |||
| @@ -441,10 +441,10 @@ void RasterizerVulkan::UnmapMemory(VAddr addr, u64 size) { | |||
| 441 | pipeline_cache.OnCPUWrite(addr, size); | 441 | pipeline_cache.OnCPUWrite(addr, size); |
| 442 | } | 442 | } |
| 443 | 443 | ||
| 444 | void RasterizerVulkan::ModifyGPUMemory(GPUVAddr addr, u64 size) { | 444 | void RasterizerVulkan::ModifyGPUMemory(size_t as_id, GPUVAddr addr, u64 size) { |
| 445 | { | 445 | { |
| 446 | std::scoped_lock lock{texture_cache.mutex}; | 446 | std::scoped_lock lock{texture_cache.mutex}; |
| 447 | texture_cache.UnmapGPUMemory(addr, size); | 447 | texture_cache.UnmapGPUMemory(as_id, addr, size); |
| 448 | } | 448 | } |
| 449 | } | 449 | } |
| 450 | 450 | ||
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.h b/src/video_core/renderer_vulkan/vk_rasterizer.h index 642fe6576..c836158b8 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.h +++ b/src/video_core/renderer_vulkan/vk_rasterizer.h | |||
| @@ -78,7 +78,7 @@ public: | |||
| 78 | void OnCPUWrite(VAddr addr, u64 size) override; | 78 | void OnCPUWrite(VAddr addr, u64 size) override; |
| 79 | void SyncGuestHost() override; | 79 | void SyncGuestHost() override; |
| 80 | void UnmapMemory(VAddr addr, u64 size) override; | 80 | void UnmapMemory(VAddr addr, u64 size) override; |
| 81 | void ModifyGPUMemory(GPUVAddr addr, u64 size) override; | 81 | void ModifyGPUMemory(size_t as_id, GPUVAddr addr, u64 size) override; |
| 82 | void SignalSemaphore(GPUVAddr addr, u32 value) override; | 82 | void SignalSemaphore(GPUVAddr addr, u32 value) override; |
| 83 | void SignalSyncPoint(u32 value) override; | 83 | void SignalSyncPoint(u32 value) override; |
| 84 | void SignalReference() override; | 84 | void SignalReference() override; |