Simplify VulkanHpp configuration and remove outdated Vulkan SDK symlink logic in CI.

Author: gpx1000

.github/workflows/workflow.yml

@@ -307,71 +307,6 @@ jobs:
       - name: Install Vulkan SDK
         run: ${{ matrix.vulkan-install }}
 
-      - name: Create Vulkan SDK version symlinks (Ubuntu)
-        if: runner.os == 'Linux'
-        run: |
-          # Get the current Vulkan SDK version
-          CURRENT_VERSION=$(basename $(dirname $VULKAN_SDK))
-          echo "Current Vulkan SDK version: $CURRENT_VERSION"
-
-          # Create a directory to store version information
-          VULKAN_BASE_DIR=$(dirname $(dirname $VULKAN_SDK))
-          echo "Vulkan base directory: $VULKAN_BASE_DIR"
-
-          # Create a symlink for the 'latest' directory
-          mkdir -p $VULKAN_BASE_DIR/latest
-          ln -sf $VULKAN_SDK $VULKAN_BASE_DIR/latest/x86_64
-          echo "Created symlink from latest to $CURRENT_VERSION"
-
-          # Create a file to track the current version for future runs
-          echo $CURRENT_VERSION > $VULKAN_BASE_DIR/current_version.txt
-
-          # Check if there are any previous versions we need to create symlinks for
-          if [ -f "$VULKAN_BASE_DIR/previous_versions.txt" ]; then
-            echo "Found previous versions file, creating symlinks for all previous versions"
-            while read -r version; do
-              if [ "$version" != "$CURRENT_VERSION" ] && [ -n "$version" ]; then
-                echo "Creating symlink from $version to $CURRENT_VERSION"
-                mkdir -p $VULKAN_BASE_DIR/$version
-                ln -sf $VULKAN_SDK $VULKAN_BASE_DIR/$version/x86_64
-              fi
-            done < $VULKAN_BASE_DIR/previous_versions.txt
-          fi
-
-          # Add current version to the list of previous versions for future runs
-          if [ ! -f "$VULKAN_BASE_DIR/previous_versions.txt" ] || ! grep -q "^$CURRENT_VERSION$" "$VULKAN_BASE_DIR/previous_versions.txt"; then
-            echo $CURRENT_VERSION >> $VULKAN_BASE_DIR/previous_versions.txt
-          fi
-
-          # For the first run or if we need to handle hardcoded paths in existing build files,
-          # create symlinks for known versions that might be referenced
-          for version in "1.4.313.0" "1.4.321.0"; do
-            if [ "$version" != "$CURRENT_VERSION" ]; then
-              echo "Creating symlink from $version to $CURRENT_VERSION"
-              mkdir -p $VULKAN_BASE_DIR/$version
-              ln -sf $VULKAN_SDK $VULKAN_BASE_DIR/$version/x86_64
-            fi
-          done
-
-          # Find any version references in build files and create symlinks for them
-          if [ -d "${{github.workspace}}/attachments/build" ]; then
-            echo "Scanning build directory for version references..."
-            # Find all version patterns like X.Y.ZZZ.W in build files
-            FOUND_VERSIONS=$(grep -r -o "[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+" ${{github.workspace}}/attachments/build 2>/dev/null | grep -v "$CURRENT_VERSION" | sort | uniq || echo "")
-
-            for version in $FOUND_VERSIONS; do
-              if [[ $version =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]] && [ "$version" != "$CURRENT_VERSION" ]; then
-                echo "Found version reference in build files: $version, creating symlink"
-                mkdir -p $VULKAN_BASE_DIR/$version
-                ln -sf $VULKAN_SDK $VULKAN_BASE_DIR/$version/x86_64
-              fi
-            done
-          fi
-
-          # List all created symlinks
-          echo "Created the following Vulkan SDK version symlinks:"
-          find $VULKAN_BASE_DIR -type l -exec ls -la {} \;
-
       - name: Verify Vulkan Installation (Windows)
         if: runner.os == 'Windows'
         run: |

attachments/CMake/FindVulkanHpp.cmake

@@ -225,38 +225,7 @@ module;
 #include <vulkan/vulkan.hpp>
 export module vulkan;
 export namespace vk {
-  // Import symbols from the main namespace
   using namespace VULKAN_HPP_NAMESPACE;
-
-  // Import symbols from the detail namespace
-  using VULKAN_HPP_NAMESPACE::detail::DispatchLoaderBase;
-  using VULKAN_HPP_NAMESPACE::detail::DispatchLoaderDynamic;
-  using VULKAN_HPP_NAMESPACE::detail::DispatchLoaderStatic;
-  using VULKAN_HPP_NAMESPACE::detail::ObjectDestroy;
-  using VULKAN_HPP_NAMESPACE::detail::ObjectDestroyShared;
-  using VULKAN_HPP_NAMESPACE::detail::ObjectFree;
-  using VULKAN_HPP_NAMESPACE::detail::ObjectFreeShared;
-  using VULKAN_HPP_NAMESPACE::detail::ObjectRelease;
-  using VULKAN_HPP_NAMESPACE::detail::ObjectReleaseShared;
-  using VULKAN_HPP_NAMESPACE::detail::PoolFree;
-  using VULKAN_HPP_NAMESPACE::detail::PoolFreeShared;
-  using VULKAN_HPP_NAMESPACE::detail::createResultValueType;
-  using VULKAN_HPP_NAMESPACE::detail::resultCheck;
-  using VULKAN_HPP_NAMESPACE::detail::DynamicLoader;
-
-  // Export detail namespace for other symbols
-  namespace detail {
-    using namespace VULKAN_HPP_NAMESPACE::detail;
-  }
-
-  // Export raii namespace
-  namespace raii {
-    using namespace VULKAN_HPP_RAII_NAMESPACE;
-
-    // Import symbols from the detail namespace
-    using VULKAN_HPP_NAMESPACE::detail::ContextDispatcher;
-    using VULKAN_HPP_NAMESPACE::detail::DeviceDispatcher;
-  }
 }
 ")
   endif()
@@ -357,11 +326,6 @@ module;
 export module vulkan;
 export namespace vk {
   using namespace VULKAN_HPP_NAMESPACE;
-
-  // Export detail namespace symbols that might be referenced directly
-  namespace detail {
-    using namespace VULKAN_HPP_NAMESPACE::detail;
-  }
 }
 ")
     endif()
@@ -451,11 +415,6 @@ module;
 export module vulkan;
 export namespace vk {
   using namespace VULKAN_HPP_NAMESPACE;
-
-  // Export detail namespace symbols that might be referenced directly
-  namespace detail {
-    using namespace VULKAN_HPP_NAMESPACE::detail;
-  }
 }
 ")
     endif()