Merge branch 'main' into clang_format

# Conflicts:
#	attachments/07_image_views.cpp
#	attachments/08_graphics_pipeline.cpp
#	attachments/09_shader_modules.cpp
#	attachments/10_fixed_functions.cpp
#	attachments/12_graphics_pipeline_complete.cpp
#	attachments/14_command_buffers.cpp
#	attachments/15_hello_triangle.cpp
#	attachments/16_frames_in_flight.cpp
#	attachments/17_swap_chain_recreation.cpp
#	attachments/18_vertex_input.cpp
#	attachments/19_vertex_buffer.cpp
#	attachments/20_staging_buffer.cpp
#	attachments/21_index_buffer.cpp
#	attachments/22_descriptor_layout.cpp
#	attachments/23_descriptor_sets.cpp
#	attachments/24_texture_image.cpp
#	attachments/25_sampler.cpp
#	attachments/26_texture_mapping.cpp
#	attachments/27_depth_buffering.cpp
#	attachments/28_model_loading.cpp
#	attachments/29_mipmapping.cpp
#	attachments/30_multisampling.cpp
#	attachments/31_compute_shader.cpp
#	attachments/32_ecosystem_utilities.cpp
#	attachments/33_vulkan_profiles.cpp
#	attachments/34_android.cpp
#	attachments/35_gltf_ktx.cpp
#	attachments/36_multiple_objects.cpp
#	attachments/37_multithreading.cpp

Author: SaschaWillems

.gitignore

@@ -11,4 +11,10 @@ ebook/*.epub
 
 convert.py
 
-attachments/build/
+attachments/build/**
+attachments/android/.gradle/**
+attachments/android/.idea
+attachments/android/.gradle/**
+attachments/android/app/.cxx/**
+attachments/android/app/build/**
+local.properties

attachments/00_base_code.cpp

@@ -1,75 +1,64 @@
 #include <memory>
-#ifdef __INTELLISENSE__
-#	include <vulkan/vulkan_raii.hpp>
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
+#include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
 #endif
 #include <GLFW/glfw3.h>
-#include <vulkan/vk_platform.h>
 
-#include <cstdlib>
 #include <iostream>
 #include <stdexcept>
+#include <cstdlib>
 
-const uint32_t WIDTH  = 800;
+const uint32_t WIDTH = 800;
 const uint32_t HEIGHT = 600;
 
-class HelloTriangleApplication
-{
-  public:
-	void run()
-	{
-		initWindow();
-		initVulkan();
-		mainLoop();
-		cleanup();
-	}
+class HelloTriangleApplication {
+public:
+    void run() {
+        initWindow();
+        initVulkan();
+        mainLoop();
+        cleanup();
+    }
+
+private:
+    GLFWwindow* window = nullptr;
 
-  private:
-	GLFWwindow *window = nullptr;
+    void initWindow() {
+        glfwInit();
 
-	void initWindow()
-	{
-		glfwInit();
+        glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
+        glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
 
-		glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
-		glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
+        window = glfwCreateWindow(WIDTH, HEIGHT, "Vulkan", nullptr, nullptr);
+    }
 
-		window = glfwCreateWindow(WIDTH, HEIGHT, "Vulkan", nullptr, nullptr);
-	}
+    void initVulkan() {
 
-	void initVulkan()
-	{
-	}
+    }
 
-	void mainLoop()
-	{
-		while (!glfwWindowShouldClose(window))
-		{
-			glfwPollEvents();
-		}
-	}
+    void mainLoop() {
+        while (!glfwWindowShouldClose(window)) {
+            glfwPollEvents();
+        }
+    }
 
-	void cleanup()
-	{
-		glfwDestroyWindow(window);
+    void cleanup() {
+        glfwDestroyWindow(window);
 
-		glfwTerminate();
-	}
+        glfwTerminate();
+    }
 };
 
-int main()
-{
-	try
-	{
-		HelloTriangleApplication app;
-		app.run();
-	}
-	catch (const std::exception &e)
-	{
-		std::cerr << e.what() << std::endl;
-		return EXIT_FAILURE;
-	}
+int main() {
+    try {
+        HelloTriangleApplication app;
+        app.run();
+    } catch (const std::exception& e) {
+        std::cerr << e.what() << std::endl;
+        return EXIT_FAILURE;
+    }
 
-	return EXIT_SUCCESS;
+    return EXIT_SUCCESS;
 }

attachments/01_instance_creation.cpp

@@ -1,113 +1,100 @@
 #include <algorithm>
-#include <cstdlib>
 #include <iostream>
-#include <memory>
 #include <stdexcept>
+#include <cstdlib>
+#include <memory>
 
-#ifdef __INTELLISENSE__
-#	include <vulkan/vulkan_raii.hpp>
+#if defined(__INTELLISENSE__) || !defined(USE_CPP20_MODULES)
+#include <vulkan/vulkan_raii.hpp>
 #else
 import vulkan_hpp;
 #endif
 
-#include <vulkan/vk_platform.h>
-
-#define GLFW_INCLUDE_VULKAN        // REQUIRED only for GLFW CreateWindowSurface.
+#define GLFW_INCLUDE_VULKAN // REQUIRED only for GLFW CreateWindowSurface.
 #include <GLFW/glfw3.h>
 
-constexpr uint32_t WIDTH  = 800;
+constexpr uint32_t WIDTH = 800;
 constexpr uint32_t HEIGHT = 600;
 
-class HelloTriangleApplication
-{
-  public:
-	void run()
-	{
-		initWindow();
-		initVulkan();
-		mainLoop();
-		cleanup();
-	}
-
-  private:
-	GLFWwindow *window = nullptr;
-
-	vk::raii::Context  context;
-	vk::raii::Instance instance = nullptr;
-
-	void initWindow()
-	{
-		glfwInit();
-
-		glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
-		glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
-
-		window = glfwCreateWindow(WIDTH, HEIGHT, "Vulkan", nullptr, nullptr);
-	}
-
-	void initVulkan()
-	{
-		createInstance();
-	}
-
-	void mainLoop()
-	{
-		while (!glfwWindowShouldClose(window))
-		{
-			glfwPollEvents();
-		}
-	}
-
-	void cleanup()
-	{
-		glfwDestroyWindow(window);
-
-		glfwTerminate();
-	}
-
-	void createInstance()
-	{
-		constexpr vk::ApplicationInfo appInfo{.pApplicationName   = "Hello Triangle",
-		                                      .applicationVersion = VK_MAKE_VERSION(1, 0, 0),
-		                                      .pEngineName        = "No Engine",
-		                                      .engineVersion      = VK_MAKE_VERSION(1, 0, 0),
-		                                      .apiVersion         = vk::ApiVersion14};
-
-		// Get the required instance extensions from GLFW.
-		uint32_t glfwExtensionCount = 0;
-		auto     glfwExtensions     = glfwGetRequiredInstanceExtensions(&glfwExtensionCount);
-
-		// Check if the required GLFW extensions are supported by the Vulkan implementation.
-		auto extensionProperties = context.enumerateInstanceExtensionProperties();
-		for (uint32_t i = 0; i < glfwExtensionCount; ++i)
-		{
-			if (std::ranges::none_of(extensionProperties,
-			                         [glfwExtension = glfwExtensions[i]](auto const &extensionProperty) { return strcmp(extensionProperty.extensionName, glfwExtension) == 0; }))
-			{
-				throw std::runtime_error("Required GLFW extension not supported: " + std::string(glfwExtensions[i]));
-			}
-		}
-
-		vk::InstanceCreateInfo createInfo{
-		    .pApplicationInfo        = &appInfo,
-		    .enabledExtensionCount   = glfwExtensionCount,
-		    .ppEnabledExtensionNames = glfwExtensions};
-		instance = vk::raii::Instance(context, createInfo);
-	}
+class HelloTriangleApplication {
+public:
+    void run() {
+        initWindow();
+        initVulkan();
+        mainLoop();
+        cleanup();
+    }
+
+private:
+    GLFWwindow* window = nullptr;
+
+    vk::raii::Context  context;
+    vk::raii::Instance instance = nullptr;
+
+    void initWindow() {
+        glfwInit();
+
+        glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
+        glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
+
+        window = glfwCreateWindow(WIDTH, HEIGHT, "Vulkan", nullptr, nullptr);
+    }
+
+    void initVulkan() {
+        createInstance();
+    }
+
+    void mainLoop() {
+        while (!glfwWindowShouldClose(window)) {
+            glfwPollEvents();
+        }
+    }
+
+    void cleanup() {
+        glfwDestroyWindow(window);
+
+        glfwTerminate();
+    }
+
+    void createInstance() {
+        constexpr vk::ApplicationInfo appInfo{ .pApplicationName   = "Hello Triangle",
+            .applicationVersion = VK_MAKE_VERSION( 1, 0, 0 ),
+            .pEngineName        = "No Engine",
+            .engineVersion      = VK_MAKE_VERSION( 1, 0, 0 ),
+            .apiVersion         = vk::ApiVersion14 };
+
+        // Get the required instance extensions from GLFW.
+        uint32_t glfwExtensionCount = 0;
+        auto glfwExtensions = glfwGetRequiredInstanceExtensions(&glfwExtensionCount);
+
+        // Check if the required GLFW extensions are supported by the Vulkan implementation.
+        auto extensionProperties = context.enumerateInstanceExtensionProperties();
+        for (uint32_t i = 0; i < glfwExtensionCount; ++i)
+        {
+            if (std::ranges::none_of(extensionProperties,
+                                     [glfwExtension = glfwExtensions[i]](auto const& extensionProperty)
+                                     { return strcmp(extensionProperty.extensionName, glfwExtension) == 0; }))
+            {
+                throw std::runtime_error("Required GLFW extension not supported: " + std::string(glfwExtensions[i]));
+            }
+        }
+
+        vk::InstanceCreateInfo createInfo{
+            .pApplicationInfo = &appInfo,
+            .enabledExtensionCount = glfwExtensionCount,
+            .ppEnabledExtensionNames = glfwExtensions};
+        instance = vk::raii::Instance(context, createInfo);
+    }
 };
 
-int main()
-{
-	try
-	{
-		HelloTriangleApplication app;
-		app.run();
-	}
-	catch (const std::exception &e)
-	{
-		std::cerr << e.what() << std::endl;
-		return EXIT_FAILURE;
-	}
-
-	return EXIT_SUCCESS;
+int main() {
+    try {
+        HelloTriangleApplication app;
+        app.run();
+    } catch (const std::exception& e) {
+        std::cerr << e.what() << std::endl;
+        return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
 }