diff options
| author | bunnei <bunneidev@gmail.com> | 2020-12-05 00:48:08 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-05 00:48:08 -0800 |
| commit | e6a896c4bdf9cc47c2002c115c9ff280e540fd1b (patch) | |
| tree | e5cd397cb3a11f1529f38ed8fa0a0185d07becaa /src/video_core/renderer_vulkan | |
| parent | 63419e144ffeeb30220bacd6307360c76b4363f1 (diff) | |
| parent | 677a8b208d47d0d2397197ce74c7039a8ea79d20 (diff) | |
Merge pull request #5124 from lioncash/video-shadow
video_core: Resolve more variable shadowing scenarios
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_command_pool.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_command_pool.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/vk_command_pool.cpp b/src/video_core/renderer_vulkan/vk_command_pool.cpp index 6339f4fe0..256a39148 100644 --- a/src/video_core/renderer_vulkan/vk_command_pool.cpp +++ b/src/video_core/renderer_vulkan/vk_command_pool.cpp @@ -17,8 +17,8 @@ struct CommandPool::Pool { vk::CommandBuffers cmdbufs; }; -CommandPool::CommandPool(MasterSemaphore& master_semaphore, const VKDevice& device) - : ResourcePool(master_semaphore, COMMAND_BUFFER_POOL_SIZE), device{device} {} +CommandPool::CommandPool(MasterSemaphore& master_semaphore, const VKDevice& device_) + : ResourcePool(master_semaphore, COMMAND_BUFFER_POOL_SIZE), device{device_} {} CommandPool::~CommandPool() = default; diff --git a/src/video_core/renderer_vulkan/vk_command_pool.h b/src/video_core/renderer_vulkan/vk_command_pool.h index b9cb3fb5d..33655eca4 100644 --- a/src/video_core/renderer_vulkan/vk_command_pool.h +++ b/src/video_core/renderer_vulkan/vk_command_pool.h @@ -17,7 +17,7 @@ class VKDevice; class CommandPool final : public ResourcePool { public: - explicit CommandPool(MasterSemaphore& master_semaphore, const VKDevice& device); + explicit CommandPool(MasterSemaphore& master_semaphore, const VKDevice& device_); ~CommandPool() override; void Allocate(size_t begin, size_t end) override; |
