Use C++ modules

13 files changed, 178 insertions, 178 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c4c4ffc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.zip
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c916974..631e1e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,16 @@
-cmake_minimum_required(VERSION 3.20)
-
-project(dx12)
+cmake_minimum_required(VERSION 3.25)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1)
+set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
+set(CMAKE_CXX_SCAN_FOR_MODULES ON)
 
-# -MT, multi-threaded statically-linked runtime library.
-#set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded)
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /DDEBUG")
+# Multi-threaded statically-linked runtime library (-MT)
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
+project(dx12)
 
 # External dependencies.
 add_subdirectory(contrib/DirectX-Headers)
diff --git a/contrib/glfw/CMakeLists.txt b/contrib/glfw/CMakeLists.txt
index 3521151..5635cfb 100644
--- a/contrib/glfw/CMakeLists.txt
+++ b/contrib/glfw/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.25)
 
 add_library(glfw INTERFACE)
 
diff --git a/dxcommon/CMakeLists.txt b/dxcommon/CMakeLists.txt
index 08fa178..dfb52bf 100644
--- a/dxcommon/CMakeLists.txt
+++ b/dxcommon/CMakeLists.txt
@@ -1,10 +1,18 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.25)
 
-add_library(dxcommon
-    src/dxcommon.cc)
+project(dxcommon)
+
+add_library(dxcommon)
+
+target_sources(dxcommon PUBLIC
+    dxcommon.h)
+
+target_sources(dxcommon PUBLIC
+    FILE_SET cxx_modules TYPE CXX_MODULES FILES
+    dxcommon.ixx)
 
 target_include_directories(dxcommon PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/include)
+    .)
 
 target_link_libraries(dxcommon PUBLIC
     DirectX-Headers
diff --git a/dxcommon/dxcommon.h b/dxcommon/dxcommon.h
new file mode 100644
index 0000000..addb8c3
--- /dev/null
+++ b/dxcommon/dxcommon.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <d3d12.h>
+#include <dxgi1_4.h>
+#include <directx/d3dx12.h>
+
+#define THROW(error) throw exception(error, __FILE__, __LINE__)
+
+#define ThrowIfFailed(result) \
+{\
+    if (result != S_OK) \
+    {\
+        THROW(result);\
+    }\
+}
+
+//#define IID_PPV_ARGS(ppType) __uuidof(**(ppType)), static_cast<void**>(ppType)
diff --git a/dxcommon/include/dxcommon.h b/dxcommon/dxcommon.ixx
index 35ec0e2..b06ae95 100644
--- a/dxcommon/include/dxcommon.h
+++ b/dxcommon/dxcommon.ixx
@@ -1,14 +1,15 @@
-#pragma once
+module;
 
 #include <wrl.h>
-
 #include <stdexcept>
 
-//#define IID_PPV_ARGS(ppType) __uuidof(**(ppType)), static_cast<void**>(ppType)
+export module dxcommon;
+
+using Microsoft::WRL::ComPtr;
 
 namespace dx {
 
-using Microsoft::WRL::ComPtr;
+export {
 
 class exception : public std::exception
 {
@@ -35,16 +36,6 @@ private:
     static thread_local char m_error[1024];
 };
 
-#define THROW(error) throw exception(error, __FILE__, __LINE__)
-
-#define ThrowIfFailed(result) \
-{\
-    if (result != S_OK) \
-    {\
-        THROW(result);\
-    }\
-}
-
 template <typename T>
 void SafeRelease(ComPtr<T>& ptr)
 {
@@ -55,4 +46,8 @@ void SafeRelease(ComPtr<T>& ptr)
     }
 }
 
-}  // dx
+} // export
+
+thread_local char exception::m_error[1024];
+
+} // dx
diff --git a/dxcommon/src/dxcommon.cc b/dxcommon/src/dxcommon.cc
deleted file mode 100644
index 2139136..0000000
--- a/dxcommon/src/dxcommon.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "dxcommon.h"
-
-namespace dx
-{
-
-thread_local char exception::m_error[1024];
-
-}  // namespace dx
diff --git a/dxwindow/CMakeLists.txt b/dxwindow/CMakeLists.txt
index baf99de..16c1709 100644
--- a/dxwindow/CMakeLists.txt
+++ b/dxwindow/CMakeLists.txt
@@ -1,10 +1,10 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.25)
 
-add_library(dxwindow
-    src/dxwindow.cc)
+add_library(dxwindow)
 
-target_include_directories(dxwindow PUBLIC
-    include/)
+target_sources(dxwindow PUBLIC
+    FILE_SET cxx_modules TYPE CXX_MODULES FILES
+    dxwindow.ixx)
 
 target_link_libraries(dxwindow PUBLIC
     glfw)
diff --git a/dxwindow/dxwindow.ixx b/dxwindow/dxwindow.ixx
new file mode 100644
index 0000000..6efcc18
--- /dev/null
+++ b/dxwindow/dxwindow.ixx
@@ -0,0 +1,113 @@
+module;
+
+// Include Windows.h before GLFW to avoid macro redefinition warnings.
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+#define GLFW_INCLUDE_NONE  // Do not include OpenGL headers.
+#include <GLFW/glfw3.h>
+
+#define GLFW_EXPOSE_NATIVE_WIN32
+#include <GLFW/glfw3native.h>
+
+#include <cassert>
+#include <cstdio>
+
+export module dxwindow;
+
+namespace dx {
+
+char glfw_error[1024] = {};
+
+void glfw_error_callback(int error, const char* description)
+{
+    sprintf_s(glfw_error, sizeof(glfw_error),
+        "GLFW error %d: %s", error, description);
+}
+
+export {
+
+class Window
+{
+public:
+    ~Window()
+    {
+        if (m_window != nullptr)
+        {
+            glfwDestroyWindow(m_window);
+        }
+    }
+
+    /// Creates the window.
+    bool Initialise(int width, int height, const char* title)
+    {
+        // GLFW by default creates an OpenGL context with the window.
+        // Use GLFW_NO_API to tell it not to do so.
+        glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
+
+        if ((m_window = glfwCreateWindow(
+            width, height, title, /*monitor=*/NULL, /*share=*/NULL)) == nullptr)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    /// Returns the native window handle.
+    /// If the window has not been initialized, returns an invalid handle.
+    HWND GetWindowHandle()
+    {
+        if (!m_window)
+        {
+            return NULL;
+        }
+        return glfwGetWin32Window(m_window);
+    }
+
+    /// Updates the window by polling for user input.
+    void Update()
+    {
+        assert(m_window);
+        glfwPollEvents();
+    }
+
+    /// Returns true if the user tried to close the window, false otherwise.
+    bool ShouldClose() const
+    {
+        assert(m_window);
+        return glfwWindowShouldClose(m_window) == GLFW_TRUE;
+    }
+
+private:
+    GLFWwindow* m_window = nullptr;
+};
+
+/// Initialise the window subsystem.
+///
+/// This function must be called at the start of your application before any
+/// Windows are created.
+bool WindowInitialise()
+{
+    glfwSetErrorCallback(glfw_error_callback);
+    return glfwInit() == GLFW_TRUE;
+}
+
+/// Terminate the window subsystem.
+///
+/// This function should be called at the end of your application. Any existing
+/// Windows are destroyed and are invalid beyond this call.
+void WindowTerminate()
+{
+    glfwTerminate();
+}
+
+/// Returns the last Window error.
+const char* GetWindowError()
+{
+    return glfw_error;
+}
+
+} // export
+
+} // namespace dx
diff --git a/dxwindow/include/dxwindow.h b/dxwindow/include/dxwindow.h
deleted file mode 100644
index e8f551a..0000000
--- a/dxwindow/include/dxwindow.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-// Include Windows.h before GLFW to avoid macro redefinition warnings.
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
-#define GLFW_INCLUDE_NONE  // Do not include OpenGL headers.
-#include <GLFW/glfw3.h>
-
-namespace dx
-{
-
-class Window
-{
-public:
-    ~Window();
-
-    /// Creates the window.
-    bool Initialise(int width, int height, const char* title);
-
-    /// Returns the native window handle.
-    /// If the window has not been initialized, returns an invalid handle.
-    HWND GetWindowHandle();
-
-    /// Updates the window by polling for user input.
-    void Update();
-
-    /// Returns true if the user tried to close the window, false otherwise.
-    bool ShouldClose() const;
-
-private:
-    GLFWwindow* m_window = nullptr;
-};
-
-/// Initialise the window subsystem.
-///
-/// This function must be called at the start of your application before any
-/// Windows are created.
-bool WindowInitialise();
-
-/// Terminate the window subsystem.
-///
-/// This function should be called at the end of your application. Any existing
-/// Windows are destroyed and are invalid beyond this call.
-void WindowTerminate();
-
-/// Returns the last Window error.
-const char* GetWindowError();
-
-}  // namespace dx
diff --git a/dxwindow/src/dxwindow.cc b/dxwindow/src/dxwindow.cc
deleted file mode 100644
index 8848a7e..0000000
--- a/dxwindow/src/dxwindow.cc
+++ /dev/null
@@ -1,80 +0,0 @@
-#include "dxwindow.h"
-
-#define GLFW_EXPOSE_NATIVE_WIN32
-#include <GLFW/glfw3native.h>
-
-#include <cassert>
-#include <cstdio>
-
-namespace dx
-{
-
-static char glfw_error[1024] = {};
-
-static void glfw_error_callback(int error, const char* description)
-{
-    sprintf_s(glfw_error, sizeof(glfw_error),
-        "GLFW error %d: %s", error, description);
-}
-
-Window::~Window()
-{
-    if (m_window != nullptr)
-    {
-        glfwDestroyWindow(m_window);
-    }
-}
-
-bool Window::Initialise(int width, int height, const char* title)
-{
-    // GLFW by default creates an OpenGL context with the window.
-    // Use GLFW_NO_API to tell it not to do so.
-    glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
-
-    if ((m_window = glfwCreateWindow(
-        width, height, title, /*monitor=*/NULL, /*share=*/NULL)) == nullptr)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-HWND Window::GetWindowHandle()
-{
-    if (!m_window)
-    {
-        return NULL;
-    }
-    return glfwGetWin32Window(m_window);
-}
-
-void Window::Update()
-{
-    assert(m_window);
-    glfwPollEvents();
-}
-
-bool Window::ShouldClose() const
-{
-    assert(m_window);
-    return glfwWindowShouldClose(m_window) == GLFW_TRUE;
-}
-
-bool WindowInitialise()
-{
-    glfwSetErrorCallback(glfw_error_callback);
-    return glfwInit() == GLFW_TRUE;
-}
-
-void WindowTerminate()
-{
-    glfwTerminate();
-}
-
-const char* GetWindowError()
-{
-    return glfw_error;
-}
-
-}  // namespace dx
diff --git a/hello/CMakeLists.txt b/hello/CMakeLists.txt
index 90a0d78..ac9f285 100644
--- a/hello/CMakeLists.txt
+++ b/hello/CMakeLists.txt
@@ -1,7 +1,10 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.25)
 
-add_executable(hello main.cc)
+project(hello)
 
-target_link_libraries(hello
+add_executable(hello
+    main.cc)
+
+target_link_libraries(hello PRIVATE
     dxcommon
     dxwindow)
diff --git a/hello/main.cc b/hello/main.cc
index 8e41d4b..47a2aba 100644
--- a/hello/main.cc
+++ b/hello/main.cc
@@ -1,14 +1,13 @@
 #include <dxcommon.h>
-#include <dxwindow.h>
-
-#include <d3d12.h>
-#include <dxgi1_4.h>
-#include <directx/d3dx12.h>
 
 #include <cassert>
 #include <cstdio>
 
+import dxcommon;
+import dxwindow;
+
 using namespace dx;
+using Microsoft::WRL::ComPtr;
 
 struct D3DSettings
 {