Fix VK_EXT_layer_settings string comparison in [HPP]Instance::[HPP]In…

…stance()
KhronosGroup · Oct 23, 2024 · 5fca9a6 · 5fca9a6
1 parent 4f53d15
commit 5fca9a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/framework/core/hpp_instance.cpp b/framework/core/hpp_instance.cpp
@@ -354,7 +354,9 @@ HPPInstance::HPPInstance(const std::string                            &applicati
 	vk::LayerSettingsCreateInfoEXT layerSettingsCreateInfo;
 
 	// If layer settings extension enabled by sample, then activate layer settings during instance creation
-	if (std::find(enabled_extensions.begin(), enabled_extensions.end(), VK_EXT_LAYER_SETTINGS_EXTENSION_NAME) != enabled_extensions.end())
+	if (std::any_of(enabled_extensions.begin(),
+	                enabled_extensions.end(),
+	                [](const char *extension) { return strcmp(extension, VK_EXT_LAYER_SETTINGS_EXTENSION_NAME) == 0; }))
 	{
 		layerSettingsCreateInfo.settingCount = static_cast<uint32_t>(required_layer_settings.size());
 		layerSettingsCreateInfo.pSettings    = required_layer_settings.data();

diff --git a/framework/core/instance.cpp b/framework/core/instance.cpp
@@ -383,7 +383,9 @@ Instance::Instance(const std::string                            &application_nam
 	VkLayerSettingsCreateInfoEXT layerSettingsCreateInfo{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT};
 
 	// If layer settings extension enabled by sample, then activate layer settings during instance creation
-	if (std::find(enabled_extensions.begin(), enabled_extensions.end(), VK_EXT_LAYER_SETTINGS_EXTENSION_NAME) != enabled_extensions.end())
+	if (std::any_of(enabled_extensions.begin(),
+	                enabled_extensions.end(),
+	                [](const char *extension) { return strcmp(extension, VK_EXT_LAYER_SETTINGS_EXTENSION_NAME) == 0; }))
 	{
 		layerSettingsCreateInfo.settingCount = static_cast<uint32_t>(required_layer_settings.size());
 		layerSettingsCreateInfo.pSettings    = required_layer_settings.data();