Remove vulkan_hpp_intellisense.h and adapt CMake for conditional module import

gpx1000 · gpx1000 · commit 729d65b382f3 · 2025-07-05T13:22:43.000-07:00
- Deleted `vulkan_hpp_intellisense.h` across all attachment files.
- Updated CMake to support conditional Vulkan module import using `USE_DIRECT_MODULE_IMPORT` toggle.
diff --git a/attachments/00_base_code.cpp b/attachments/00_base_code.cpp
@@ -1,5 +1,3 @@
-#include "vulkan_hpp_intellisense.h"
-#include <memory>
 import vulkan_hpp;
 #include <GLFW/glfw3.h>
 
diff --git a/attachments/01_instance_creation.cpp b/attachments/01_instance_creation.cpp
@@ -4,7 +4,6 @@
 #include <cstdlib>
 #include <memory>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/02_validation_layers.cpp b/attachments/02_validation_layers.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 #include <algorithm>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/03_physical_device_selection.cpp b/attachments/03_physical_device_selection.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 #include <algorithm>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/04_logical_device.cpp b/attachments/04_logical_device.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 #include <algorithm>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/05_window_surface.cpp b/attachments/05_window_surface.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 #include <algorithm>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/06_swap_chain_creation.cpp b/attachments/06_swap_chain_creation.cpp
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/07_image_views.cpp b/attachments/07_image_views.cpp
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/08_graphics_pipeline.cpp b/attachments/08_graphics_pipeline.cpp
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/09_shader_modules.cpp b/attachments/09_shader_modules.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/10_fixed_functions.cpp b/attachments/10_fixed_functions.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/12_graphics_pipeline_complete.cpp b/attachments/12_graphics_pipeline_complete.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/14_command_buffers.cpp b/attachments/14_command_buffers.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/15_hello_triangle.cpp b/attachments/15_hello_triangle.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/16_frames_in_flight.cpp b/attachments/16_frames_in_flight.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/17_swap_chain_recreation.cpp b/attachments/17_swap_chain_recreation.cpp
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <limits>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/18_vertex_input.cpp b/attachments/18_vertex_input.cpp
@@ -9,7 +9,6 @@
 #include <limits>
 #include <array>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/19_vertex_buffer.cpp b/attachments/19_vertex_buffer.cpp
@@ -9,7 +9,6 @@
 #include <limits>
 #include <array>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/20_staging_buffer.cpp b/attachments/20_staging_buffer.cpp
@@ -9,7 +9,6 @@
 #include <limits>
 #include <array>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/21_index_buffer.cpp b/attachments/21_index_buffer.cpp
@@ -9,7 +9,6 @@
 #include <limits>
 #include <array>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/22_descriptor_layout.cpp b/attachments/22_descriptor_layout.cpp
@@ -10,7 +10,6 @@
 #include <array>
 #include <chrono>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/23_descriptor_sets.cpp b/attachments/23_descriptor_sets.cpp
@@ -10,7 +10,6 @@
 #include <array>
 #include <chrono>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/24_texture_image.cpp b/attachments/24_texture_image.cpp
@@ -10,7 +10,6 @@
 #include <array>
 #include <chrono>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/25_sampler.cpp b/attachments/25_sampler.cpp
@@ -10,7 +10,6 @@
 #include <array>
 #include <chrono>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/26_texture_mapping.cpp b/attachments/26_texture_mapping.cpp
@@ -10,7 +10,6 @@
 #include <array>
 #include <chrono>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/27_depth_buffering.cpp b/attachments/27_depth_buffering.cpp
@@ -10,7 +10,6 @@
 #include <array>
 #include <chrono>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/28_model_loading.cpp b/attachments/28_model_loading.cpp
@@ -10,7 +10,6 @@
 #include <array>
 #include <chrono>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/29_mipmapping.cpp b/attachments/29_mipmapping.cpp
@@ -10,7 +10,6 @@
 #include <array>
 #include <chrono>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/30_multisampling.cpp b/attachments/30_multisampling.cpp
@@ -10,7 +10,6 @@
 #include <array>
 #include <chrono>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/31_compute_shader.cpp b/attachments/31_compute_shader.cpp
@@ -14,7 +14,6 @@
 #include <chrono>
 #include <random>
 
-#include "vulkan_hpp_intellisense.h"
 import vulkan_hpp;
 #include <vulkan/vk_platform.h>
 
diff --git a/attachments/CMakeLists.txt b/attachments/CMakeLists.txt
@@ -109,14 +109,36 @@ function (add_chapter CHAPTER_NAME)
   set_target_properties (${CHAPTER_NAME} PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CHAPTER_NAME})
   set_target_properties (${CHAPTER_NAME} PROPERTIES CXX_STANDARD 20)
-  target_link_libraries (${CHAPTER_NAME} Vulkan::cppm glfw)
+
+  if(USE_DIRECT_MODULE_IMPORT)
+    # Direct module import approach - add vulkan.cppm directly to each project
+    target_sources(${CHAPTER_NAME}
+      PRIVATE
+      FILE_SET cxx_modules TYPE CXX_MODULES
+      BASE_DIRS
+      "${Vulkan_INCLUDE_DIR}"
+      FILES
+      "${Vulkan_INCLUDE_DIR}/vulkan/vulkan.cppm"
+    )
+    target_compile_definitions(${CHAPTER_NAME}
+      PRIVATE VULKAN_HPP_DISPATCH_LOADER_DYNAMIC=1 VULKAN_HPP_NO_STRUCT_CONSTRUCTORS=1
+    )
+    target_include_directories(${CHAPTER_NAME}
+      PRIVATE "${Vulkan_INCLUDE_DIR}"
+    )
+    target_link_libraries (${CHAPTER_NAME} Vulkan::Vulkan glfw)
+  else()
+    # Default approach - link to VulkanCppModule
+    target_link_libraries (${CHAPTER_NAME} Vulkan::cppm glfw)
+  endif()
+
   target_include_directories (${CHAPTER_NAME} PRIVATE ${STB_INCLUDEDIR})
 
   if(WIN32)
     if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
       set_target_properties(${CHAPTER_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${CHAPTER_NAME}")
     endif()
-  endif()  
+  endif()
 
   if (DEFINED CHAPTER_SHADER)
     set (CHAPTER_SHADER_TARGET ${CHAPTER_NAME}_shader)
diff --git a/attachments/vulkan_hpp_intellisense.h b/attachments/vulkan_hpp_intellisense.h

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include "vulkan_hpp_intellisense.h"`
`2`		`-#include <memory>`
`3`	`1`	`import vulkan_hpp;`
`4`	`2`	`#include <GLFW/glfw3.h>`
`5`	`3`