diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 3a60886433..6088032fe7 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -383,10 +383,10 @@ void Device::RemoveExtension(bool& extension, const std::string& extension_name) loaded_extensions.erase(extension_name); } -void Device::RemoveExtensionIfUnsuitable(bool is_suitable, const std::string& extension_name) { - if (loaded_extensions.contains(extension_name) && !is_suitable) { +void Device::RemoveExtensionIfUnsuitable(bool& extension, const std::string& extension_name) { + if (loaded_extensions.contains(extension_name) && !extension) { LOG_WARNING(Render_Vulkan, "Removing unsuitable extension {}", extension_name); - this->RemoveExtension(is_suitable, extension_name); + this->RemoveExtension(extension, extension_name); } } @@ -407,11 +407,12 @@ void Device::RemoveExtensionFeature(bool& extension, Feature& feature, } template -void Device::RemoveExtensionFeatureIfUnsuitable(bool is_suitable, Feature& feature, +void Device::RemoveExtensionFeatureIfUnsuitable(bool& extension, Feature& feature, const std::string& extension_name) { - if (loaded_extensions.contains(extension_name) && !is_suitable) { - LOG_WARNING(Render_Vulkan, "Removing features for unsuitable extension {}", extension_name); - this->RemoveExtensionFeature(is_suitable, feature, extension_name); + if (loaded_extensions.contains(extension_name) && !extension) { + LOG_WARNING(Render_Vulkan, + "Removing features for unsuitable extension {}", extension_name); + this->RemoveExtensionFeature(extension, feature, extension_name); } } diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 127c4f8e43..2ccd65c30f 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -941,13 +941,13 @@ private: void RemoveUnsuitableExtensions(); void RemoveExtension(bool& extension, const std::string& extension_name); - void RemoveExtensionIfUnsuitable(bool is_suitable, const std::string& extension_name); + void RemoveExtensionIfUnsuitable(bool& extension, const std::string& extension_name); template void RemoveExtensionFeature(bool& extension, Feature& feature, const std::string& extension_name); template - void RemoveExtensionFeatureIfUnsuitable(bool is_suitable, Feature& feature, + void RemoveExtensionFeatureIfUnsuitable(bool& extension, Feature& feature, const std::string& extension_name); /// Sets up queue families.