history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-18 12:45:45 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Common: ScopeGuard -> ScopedGuard

Browse Source
This commit is contained in:
Connor McLaughlin
2022-07-26 18:37:16 +10:00
parent 13e3f2a179
commit 8af4f4f01a
11 changed files with 55 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend-common/vulkan_host_display.cpp
View File

@ -1,7 +1,7 @@
#include "vulkan_host_display.h"
#include "common/assert.h"
#include "common/log.h"
#include "common/scope_guard.h"
#include "common/scoped_guard.h"
#include "common/vulkan/builders.h"
#include "common/vulkan/context.h"
#include "common/vulkan/shader_cache.h"
@ -890,12 +890,12 @@ HostDisplay::AdapterAndModeList VulkanHostDisplay::StaticGetAdapterAndModeList(c
}
else if (Vulkan::LoadVulkanLibrary())
{
Common::ScopeGuard lib_guard([]() { Vulkan::UnloadVulkanLibrary(); });
ScopedGuard lib_guard([]() { Vulkan::UnloadVulkanLibrary(); });
VkInstance instance = Vulkan::Context::CreateVulkanInstance(nullptr, false, false);
if (instance != VK_NULL_HANDLE)
{
Common::ScopeGuard instance_guard([&instance]() { vkDestroyInstance(instance, nullptr); });
ScopedGuard instance_guard([&instance]() { vkDestroyInstance(instance, nullptr); });
if (Vulkan::LoadVulkanInstanceFunctions(instance))
ret.adapter_names = Vulkan::Context::EnumerateGPUNames(instance);