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/wrapper.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/wrapper.cpp')
-rw-r--r-- | src/video_core/renderer_vulkan/wrapper.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/video_core/renderer_vulkan/wrapper.cpp b/src/video_core/renderer_vulkan/wrapper.cpp index 4e83303d8..1eced809e 100644 --- a/src/video_core/renderer_vulkan/wrapper.cpp +++ b/src/video_core/renderer_vulkan/wrapper.cpp @@ -417,7 +417,7 @@ VkResult Free(VkDevice device, VkCommandPool handle, Span<VkCommandBuffer> buffe } Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char*> extensions, - InstanceDispatch& dld) noexcept { + InstanceDispatch& dispatch) noexcept { const VkApplicationInfo application_info{ .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, .pNext = nullptr, @@ -439,17 +439,17 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char }; VkInstance instance; - if (dld.vkCreateInstance(&ci, nullptr, &instance) != VK_SUCCESS) { + if (dispatch.vkCreateInstance(&ci, nullptr, &instance) != VK_SUCCESS) { // Failed to create the instance. return {}; } - if (!Proc(dld.vkDestroyInstance, dld, "vkDestroyInstance", instance)) { + if (!Proc(dispatch.vkDestroyInstance, dispatch, "vkDestroyInstance", instance)) { // We successfully created an instance but the destroy function couldn't be loaded. // This is a good moment to panic. return {}; } - return Instance(instance, dld); + return Instance(instance, dispatch); } std::optional<std::vector<VkPhysicalDevice>> Instance::EnumeratePhysicalDevices() { @@ -540,7 +540,7 @@ std::vector<VkImage> SwapchainKHR::GetImages() const { Device Device::Create(VkPhysicalDevice physical_device, Span<VkDeviceQueueCreateInfo> queues_ci, Span<const char*> enabled_extensions, const void* next, - DeviceDispatch& dld) noexcept { + DeviceDispatch& dispatch) noexcept { const VkDeviceCreateInfo ci{ .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, .pNext = next, @@ -555,11 +555,11 @@ Device Device::Create(VkPhysicalDevice physical_device, Span<VkDeviceQueueCreate }; VkDevice device; - if (dld.vkCreateDevice(physical_device, &ci, nullptr, &device) != VK_SUCCESS) { + if (dispatch.vkCreateDevice(physical_device, &ci, nullptr, &device) != VK_SUCCESS) { return {}; } - Load(device, dld); - return Device(device, dld); + Load(device, dispatch); + return Device(device, dispatch); } Queue Device::GetQueue(u32 family_index) const noexcept { |