diff options
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_fence_manager.cpp | 18 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_fence_manager.h | 9 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_rasterizer.h | 2 |
3 files changed, 14 insertions, 15 deletions
diff --git a/src/video_core/renderer_vulkan/vk_fence_manager.cpp b/src/video_core/renderer_vulkan/vk_fence_manager.cpp index 96335f22c..788eaf19b 100644 --- a/src/video_core/renderer_vulkan/vk_fence_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_fence_manager.cpp | |||
| @@ -42,30 +42,30 @@ void InnerFence::Wait() { | |||
| 42 | scheduler.Wait(wait_tick); | 42 | scheduler.Wait(wait_tick); |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | VKFenceManager::VKFenceManager(VideoCore::RasterizerInterface& rasterizer_, Tegra::GPU& gpu_, | 45 | FenceManager::FenceManager(VideoCore::RasterizerInterface& rasterizer_, Tegra::GPU& gpu_, |
| 46 | TextureCache& texture_cache_, BufferCache& buffer_cache_, | 46 | TextureCache& texture_cache_, BufferCache& buffer_cache_, |
| 47 | VKQueryCache& query_cache_, const Device& device_, | 47 | VKQueryCache& query_cache_, const Device& device_, |
| 48 | VKScheduler& scheduler_) | 48 | VKScheduler& scheduler_) |
| 49 | : GenericFenceManager{rasterizer_, gpu_, texture_cache_, buffer_cache_, query_cache_}, | 49 | : GenericFenceManager{rasterizer_, gpu_, texture_cache_, buffer_cache_, query_cache_}, |
| 50 | scheduler{scheduler_} {} | 50 | scheduler{scheduler_} {} |
| 51 | 51 | ||
| 52 | Fence VKFenceManager::CreateFence(u32 value, bool is_stubbed) { | 52 | Fence FenceManager::CreateFence(u32 value, bool is_stubbed) { |
| 53 | return std::make_shared<InnerFence>(scheduler, value, is_stubbed); | 53 | return std::make_shared<InnerFence>(scheduler, value, is_stubbed); |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | Fence VKFenceManager::CreateFence(GPUVAddr addr, u32 value, bool is_stubbed) { | 56 | Fence FenceManager::CreateFence(GPUVAddr addr, u32 value, bool is_stubbed) { |
| 57 | return std::make_shared<InnerFence>(scheduler, addr, value, is_stubbed); | 57 | return std::make_shared<InnerFence>(scheduler, addr, value, is_stubbed); |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | void VKFenceManager::QueueFence(Fence& fence) { | 60 | void FenceManager::QueueFence(Fence& fence) { |
| 61 | fence->Queue(); | 61 | fence->Queue(); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | bool VKFenceManager::IsFenceSignaled(Fence& fence) const { | 64 | bool FenceManager::IsFenceSignaled(Fence& fence) const { |
| 65 | return fence->IsSignaled(); | 65 | return fence->IsSignaled(); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | void VKFenceManager::WaitFence(Fence& fence) { | 68 | void FenceManager::WaitFence(Fence& fence) { |
| 69 | fence->Wait(); | 69 | fence->Wait(); |
| 70 | } | 70 | } |
| 71 | 71 | ||
diff --git a/src/video_core/renderer_vulkan/vk_fence_manager.h b/src/video_core/renderer_vulkan/vk_fence_manager.h index 04eb575ce..70b56778a 100644 --- a/src/video_core/renderer_vulkan/vk_fence_manager.h +++ b/src/video_core/renderer_vulkan/vk_fence_manager.h | |||
| @@ -44,12 +44,11 @@ using Fence = std::shared_ptr<InnerFence>; | |||
| 44 | using GenericFenceManager = | 44 | using GenericFenceManager = |
| 45 | VideoCommon::FenceManager<Fence, TextureCache, BufferCache, VKQueryCache>; | 45 | VideoCommon::FenceManager<Fence, TextureCache, BufferCache, VKQueryCache>; |
| 46 | 46 | ||
| 47 | class VKFenceManager final : public GenericFenceManager { | 47 | class FenceManager final : public GenericFenceManager { |
| 48 | public: | 48 | public: |
| 49 | explicit VKFenceManager(VideoCore::RasterizerInterface& rasterizer, Tegra::GPU& gpu, | 49 | explicit FenceManager(VideoCore::RasterizerInterface& rasterizer, Tegra::GPU& gpu, |
| 50 | TextureCache& texture_cache, BufferCache& buffer_cache, | 50 | TextureCache& texture_cache, BufferCache& buffer_cache, |
| 51 | VKQueryCache& query_cache, const Device& device, | 51 | VKQueryCache& query_cache, const Device& device, VKScheduler& scheduler); |
| 52 | VKScheduler& scheduler); | ||
| 53 | 52 | ||
| 54 | protected: | 53 | protected: |
| 55 | Fence CreateFence(u32 value, bool is_stubbed) override; | 54 | Fence CreateFence(u32 value, bool is_stubbed) override; |
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.h b/src/video_core/renderer_vulkan/vk_rasterizer.h index 97eeedd9e..a2d3f7015 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.h +++ b/src/video_core/renderer_vulkan/vk_rasterizer.h | |||
| @@ -158,7 +158,7 @@ private: | |||
| 158 | PipelineCache pipeline_cache; | 158 | PipelineCache pipeline_cache; |
| 159 | VKQueryCache query_cache; | 159 | VKQueryCache query_cache; |
| 160 | AccelerateDMA accelerate_dma; | 160 | AccelerateDMA accelerate_dma; |
| 161 | VKFenceManager fence_manager; | 161 | FenceManager fence_manager; |
| 162 | 162 | ||
| 163 | vk::Event wfi_event; | 163 | vk::Event wfi_event; |
| 164 | 164 | ||