diff options
author | Chloe <25727384+ogniK5377@users.noreply.github.com> | 2020-12-05 13:45:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-05 13:45:00 +0100 |
commit | f2f346e1104106eb9323f0e141e0e67312c29849 (patch) | |
tree | 6eac8e13f3333c89d8c0f3428b8664cab63a484a /src/video_core/renderer_vulkan/vk_fence_manager.cpp | |
parent | Merge pull request #5124 from lioncash/video-shadow (diff) | |
parent | video_core: Resolve more variable shadowing scenarios pt.2 (diff) | |
download | yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar.gz yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar.bz2 yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar.lz yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar.xz yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.tar.zst yuzu-f2f346e1104106eb9323f0e141e0e67312c29849.zip |
Diffstat (limited to 'src/video_core/renderer_vulkan/vk_fence_manager.cpp')
-rw-r--r-- | src/video_core/renderer_vulkan/vk_fence_manager.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/video_core/renderer_vulkan/vk_fence_manager.cpp b/src/video_core/renderer_vulkan/vk_fence_manager.cpp index 5babbdd0b..0bcaee714 100644 --- a/src/video_core/renderer_vulkan/vk_fence_manager.cpp +++ b/src/video_core/renderer_vulkan/vk_fence_manager.cpp @@ -14,12 +14,13 @@ namespace Vulkan { -InnerFence::InnerFence(const VKDevice& device, VKScheduler& scheduler, u32 payload, bool is_stubbed) - : VideoCommon::FenceBase(payload, is_stubbed), device{device}, scheduler{scheduler} {} +InnerFence::InnerFence(const VKDevice& device_, VKScheduler& scheduler_, u32 payload_, + bool is_stubbed_) + : FenceBase{payload_, is_stubbed_}, device{device_}, scheduler{scheduler_} {} -InnerFence::InnerFence(const VKDevice& device, VKScheduler& scheduler, GPUVAddr address, - u32 payload, bool is_stubbed) - : VideoCommon::FenceBase(address, payload, is_stubbed), device{device}, scheduler{scheduler} {} +InnerFence::InnerFence(const VKDevice& device_, VKScheduler& scheduler_, GPUVAddr address_, + u32 payload_, bool is_stubbed_) + : FenceBase{address_, payload_, is_stubbed_}, device{device_}, scheduler{scheduler_} {} InnerFence::~InnerFence() = default; @@ -71,11 +72,12 @@ bool InnerFence::IsEventSignalled() const { } } -VKFenceManager::VKFenceManager(VideoCore::RasterizerInterface& rasterizer, Tegra::GPU& gpu, - Tegra::MemoryManager& memory_manager, VKTextureCache& texture_cache, - VKBufferCache& buffer_cache, VKQueryCache& query_cache, - const VKDevice& device_, VKScheduler& scheduler_) - : GenericFenceManager(rasterizer, gpu, texture_cache, buffer_cache, query_cache), +VKFenceManager::VKFenceManager(VideoCore::RasterizerInterface& rasterizer_, Tegra::GPU& gpu_, + Tegra::MemoryManager& memory_manager_, + VKTextureCache& texture_cache_, VKBufferCache& buffer_cache_, + VKQueryCache& query_cache_, const VKDevice& device_, + VKScheduler& scheduler_) + : GenericFenceManager{rasterizer_, gpu_, texture_cache_, buffer_cache_, query_cache_}, device{device_}, scheduler{scheduler_} {} Fence VKFenceManager::CreateFence(u32 value, bool is_stubbed) { |