Merge branch 'main' into feature/modularize-samples

Author: sharadhr

generator/snippets/DynamicLoader.hpp

@@ -31,32 +31,32 @@
         {
           m_library = dlopen( "libvulkan.1.dylib", RTLD_NOW | RTLD_LOCAL );
         }
-		// modern versions of macOS don't search /usr/local/lib automatically contrary to what man dlopen says
-		// Vulkan SDK uses this as the system-wide installation location, so we're going to fallback to this if all else fails
-		if ( !m_library && ( std::getenv("DYLD_FALLBACK_LIBRARY_PATH") == NULL ) )
-		{
-		  m_library = dlopen( "/usr/local/lib/libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
-		}
+        // modern versions of macOS don't search /usr/local/lib automatically contrary to what man dlopen says
+        // Vulkan SDK uses this as the system-wide installation location, so we're going to fallback to this if all else fails
+        if ( !m_library && ( std::getenv( "DYLD_FALLBACK_LIBRARY_PATH" ) == NULL ) )
+        {
+          m_library = dlopen( "/usr/local/lib/libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
+        }
         // for Homebrew installations on Apple Silicon
         if ( !m_library )
-		{
-		  m_library = dlopen( "/opt/homebrew/lib/libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
-		}
+        {
+          m_library = dlopen( "/opt/homebrew/lib/libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
+        }
+        if ( !m_library )
+        {
+          m_library = dlopen( "libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL );
+        }
+        // Add support for using Vulkan and MoltenVK in a Framework. App store rules for iOS
+        // strictly enforce no .dylib's. If they aren't found it just falls through
+        if ( !m_library )
+        {
+          m_library = dlopen( "vulkan.framework/vulkan", RTLD_NOW | RTLD_LOCAL );
+        }
         if ( !m_library )
-		{
-		  m_library = dlopen( "libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL );
-		}
-		// Add support for using Vulkan and MoltenVK in a Framework. App store rules for iOS
-		// strictly enforce no .dylib's. If they aren't found it just falls through
-		if ( !m_library )
-		{
-		  m_library = dlopen( "vulkan.framework/vulkan", RTLD_NOW | RTLD_LOCAL );
-		}
-		if ( !m_library )
-		{
-		  m_library = dlopen( "MoltenVK.framework/MoltenVK", RTLD_NOW | RTLD_LOCAL );
-		}
-#  elif defined( __unix__ ) || defined( __QNX__ ) || defined(__Fuchsia__)
+        {
+          m_library = dlopen( "MoltenVK.framework/MoltenVK", RTLD_NOW | RTLD_LOCAL );
+        }
+#  elif defined( __unix__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
         m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
         if ( !m_library )
         {

generator/snippets/includes.hpp

@@ -12,6 +12,9 @@
 #  include <string.h>  // strnlen
 #  include <string>    // std::string
 #  include <utility>   // std::exchange
+#  if defined( __APPLE__ )
+#    include <cstdlib>  // std::getenv
+#  endif
 #  if 17 <= VULKAN_HPP_CPP_VERSION
 #    include <string_view>
 #  endif

vulkan/vulkan.hpp

@@ -18,6 +18,9 @@
 #  include <string.h>  // strnlen
 #  include <string>    // std::string
 #  include <utility>   // std::exchange
+#  if defined( __APPLE__ )
+#    include <cstdlib>  // std::getenv
+#  endif
 #  if 17 <= VULKAN_HPP_CPP_VERSION
 #    include <string_view>
 #  endif