summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2022-06-26 06:32:41 +0200
committergerman77 <juangerman-13@hotmail.com>2022-06-27 03:21:45 +0200
commitfca57526906cbe859b3e295648b29da09cfd8c24 (patch)
treecbc95241ff7444a0150470e7d3293115dc1468b6
parentcore: kernel: Replace instances of KPageLinkedList with KPageGroup (diff)
downloadyuzu-fca57526906cbe859b3e295648b29da09cfd8c24.tar
yuzu-fca57526906cbe859b3e295648b29da09cfd8c24.tar.gz
yuzu-fca57526906cbe859b3e295648b29da09cfd8c24.tar.bz2
yuzu-fca57526906cbe859b3e295648b29da09cfd8c24.tar.lz
yuzu-fca57526906cbe859b3e295648b29da09cfd8c24.tar.xz
yuzu-fca57526906cbe859b3e295648b29da09cfd8c24.tar.zst
yuzu-fca57526906cbe859b3e295648b29da09cfd8c24.zip
-rw-r--r--src/video_core/renderer_vulkan/vk_fence_manager.cpp18
-rw-r--r--src/video_core/renderer_vulkan/vk_fence_manager.h9
-rw-r--r--src/video_core/renderer_vulkan/vk_rasterizer.h2
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() {
scheduler.Wait(wait_tick);
}
-VKFenceManager::VKFenceManager(VideoCore::RasterizerInterface& rasterizer_, Tegra::GPU& gpu_,
- TextureCache& texture_cache_, BufferCache& buffer_cache_,
- VKQueryCache& query_cache_, const Device& device_,
- VKScheduler& scheduler_)
+FenceManager::FenceManager(VideoCore::RasterizerInterface& rasterizer_, Tegra::GPU& gpu_,
+ TextureCache& texture_cache_, BufferCache& buffer_cache_,
+ VKQueryCache& query_cache_, const Device& device_,
+ VKScheduler& scheduler_)
: GenericFenceManager{rasterizer_, gpu_, texture_cache_, buffer_cache_, query_cache_},
scheduler{scheduler_} {}
-Fence VKFenceManager::CreateFence(u32 value, bool is_stubbed) {
+Fence FenceManager::CreateFence(u32 value, bool is_stubbed) {
return std::make_shared<InnerFence>(scheduler, value, is_stubbed);
}
-Fence VKFenceManager::CreateFence(GPUVAddr addr, u32 value, bool is_stubbed) {
+Fence FenceManager::CreateFence(GPUVAddr addr, u32 value, bool is_stubbed) {
return std::make_shared<InnerFence>(scheduler, addr, value, is_stubbed);
}
-void VKFenceManager::QueueFence(Fence& fence) {
+void FenceManager::QueueFence(Fence& fence) {
fence->Queue();
}
-bool VKFenceManager::IsFenceSignaled(Fence& fence) const {
+bool FenceManager::IsFenceSignaled(Fence& fence) const {
return fence->IsSignaled();
}
-void VKFenceManager::WaitFence(Fence& fence) {
+void FenceManager::WaitFence(Fence& fence) {
fence->Wait();
}
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>;
using GenericFenceManager =
VideoCommon::FenceManager<Fence, TextureCache, BufferCache, VKQueryCache>;
-class VKFenceManager final : public GenericFenceManager {
+class FenceManager final : public GenericFenceManager {
public:
- explicit VKFenceManager(VideoCore::RasterizerInterface& rasterizer, Tegra::GPU& gpu,
- TextureCache& texture_cache, BufferCache& buffer_cache,
- VKQueryCache& query_cache, const Device& device,
- VKScheduler& scheduler);
+ explicit FenceManager(VideoCore::RasterizerInterface& rasterizer, Tegra::GPU& gpu,
+ TextureCache& texture_cache, BufferCache& buffer_cache,
+ VKQueryCache& query_cache, const Device& device, VKScheduler& scheduler);
protected:
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:
PipelineCache pipeline_cache;
VKQueryCache query_cache;
AccelerateDMA accelerate_dma;
- VKFenceManager fence_manager;
+ FenceManager fence_manager;
vk::Event wfi_event;