From 79307b6253d6ef8b678e1fdf41338b654ca3e398 Mon Sep 17 00:00:00 2001
From: Sharadh Rajaraman <3754080+sharadhr@users.noreply.github.com>
Date: Mon, 29 Apr 2024 07:59:01 +0100
Subject: [PATCH] Check value of `VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL`
 instead of existence (#1856)

* Check value of VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL instead of existence

* Also change vulkansc.cppm
---
 VulkanHppGenerator.cpp | 7 +++++--
 vulkan/vulkan.cppm     | 2 +-
 vulkan/vulkansc.cppm   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/VulkanHppGenerator.cpp b/VulkanHppGenerator.cpp
index 395cda1..1cd8699 100644
--- a/VulkanHppGenerator.cpp
+++ b/VulkanHppGenerator.cpp
@@ -5668,8 +5668,11 @@ std::string VulkanHppGenerator::generateCppModuleUsings() const
   auto const [enterDisableEnhanced, leaveDisableEnhanced] = generateProtection( "VULKAN_HPP_DISABLE_ENHANCED_MODE", false );
   usings += "\n" + enterDisableEnhanced + replaceWithMap( usingTemplate, { { "className", "StructExtends" } } ) + leaveDisableEnhanced + "\n";
 
-  auto const [enterDynamicLoader, leaveDynamicLoader] = generateProtection( "VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL" );
-  usings += "\n" + enterDynamicLoader + replaceWithMap( usingTemplate, { { "className", "DynamicLoader" } } ) + leaveDynamicLoader + "\n";
+  auto const dynamicLoaderUsing = std::string{R"(#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
+  using VULKAN_HPP_NAMESPACE::DynamicLoader;
+#endif /*VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL*/
+)"};
+  usings += dynamicLoaderUsing;
 
   usings += generateCppModuleFormatTraitsUsings();
   usings += generateCppModuleExtensionInspectionUsings();
diff --git a/vulkan/vulkan.cppm b/vulkan/vulkan.cppm
index 6d7c8a6..8f43608 100644
--- a/vulkan/vulkan.cppm
+++ b/vulkan/vulkan.cppm
@@ -4675,7 +4675,7 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::StructExtends;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-#if defined( VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL )
+#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
   using VULKAN_HPP_NAMESPACE::DynamicLoader;
 #endif /*VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL*/
 
diff --git a/vulkan/vulkansc.cppm b/vulkan/vulkansc.cppm
index 9889589..7297f09 100644
--- a/vulkan/vulkansc.cppm
+++ b/vulkan/vulkansc.cppm
@@ -1703,7 +1703,7 @@ export namespace VULKAN_HPP_NAMESPACE
   using VULKAN_HPP_NAMESPACE::StructExtends;
 #endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-#if defined( VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL )
+#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
   using VULKAN_HPP_NAMESPACE::DynamicLoader;
 #endif /*VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL*/