Remove config.h

Author: floppyhammer

.github/workflows/cmake.yml

@@ -37,7 +37,7 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DPATHFINDER_USE_D3D11=ON -DPATHFINDER_BUILD_DEMO=ON
 
     - name: Build
       # Build your program with the given configuration

CMakeLists.txt

@@ -11,6 +11,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 option(PATHFINDER_BACKEND_OPENGL "Enable OpenGL backend" ON)
 option(PATHFINDER_BACKEND_VULKAN "Enable Vulkan backend" ON)
 option(PATHFINDER_BUILD_DEMO "Build demo" OFF)
+option(PATHFINDER_USE_D3D11 "Use D3D11" OFF)
 
 # Identify Linux.
 if (UNIX AND NOT APPLE AND NOT ANDROID)
@@ -24,23 +25,29 @@ if (EMSCRIPTEN)
     set(PATHFINDER_BACKEND_OPENGL ON)
     # No Vulkan support for web.
     set(PATHFINDER_BACKEND_VULKAN OFF)
+    # No compute shader for web.
+    set(PATHFINDER_USE_D3D11 OFF)
 elseif (APPLE)
     # No GL support for Mac.
     set(PATHFINDER_BACKEND_OPENGL OFF)
     set(PATHFINDER_BACKEND_VULKAN ON)
 elseif (LINUX)
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64")
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64")
         message(STATUS "Building on ARM architecture")
-    else()
+    else ()
         message(STATUS "Not on ARM architecture")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
-    endif()
+    endif ()
 endif ()
 
 add_subdirectory(pathfinder)
 
 target_compile_features(pathfinder PUBLIC cxx_std_14)
 
+if (PATHFINDER_USE_D3D11)
+    target_compile_definitions(pathfinder PUBLIC PATHFINDER_ENABLE_D3D11)
+endif ()
+
 if (PATHFINDER_BACKEND_VULKAN)
     message("[Pathfinder] Enabled Vulkan backend")
 

pathfinder/common/f32x4.h

@@ -4,13 +4,17 @@
 #include <algorithm>
 #include <cstdint>
 
-#include "../config.h"
 #include "logger.h"
 #include "math/vec2.h"
 
 #undef min
 #undef max
 
+/// Enable SIMD.
+#if !defined(PATHFINDER_EMSCRIPTEN) && !defined(PATHFINDER_APPLE)
+    #define PATHFINDER_ENABLE_SIMD
+#endif
+
 #ifdef PATHFINDER_ENABLE_SIMD
     #if defined(__ANDROID__) || (defined(__linux__) && defined(__ARM_ARCH))
         // Converts Intel SSE intrinsics to Arm/Aarch64 NEON intrinsics.

pathfinder/common/i32x4.h

@@ -3,8 +3,6 @@
 
 #include <cstdint>
 
-#include "../config.h"
-
 #if defined(__ANDROID__) || (defined(__linux__) && defined(__ARM_ARCH))
     // A C/C++ header file that converts Intel SSE intrinsics to Arm/Aarch64 NEON intrinsics.
     #include <sse2neon.h>
@@ -28,31 +26,31 @@ struct I32x4 {
         v = _mm_setr_epi32(x, y, z, w);
     }
 
-    inline static I32x4 splat(int32_t x) {
+    static I32x4 splat(int32_t x) {
         return I32x4(_mm_set1_epi32(x));
     }
 
-    inline I32x4 shift_l(int32_t count) const {
+    I32x4 shift_l(int32_t count) const {
         // Same as _mm_sllv_epi32(v, _mm_set1_epi32(count)), but that requires AVX2.
         // Cf. https://stackoverflow.com/questions/14731442/am-i-using-mm-srl-epi32-wrong
         return I32x4(_mm_sll_epi32(v, _mm_set_epi32(0, 0, 0, count)));
     }
 
-    inline I32x4 shift_r(int32_t count) const {
+    I32x4 shift_r(int32_t count) const {
         // Same as _mm_srlv_epi32(v, _mm_set1_epi32(count)), but that requires AVX2.
         // Cf. https://stackoverflow.com/questions/14731442/am-i-using-mm-srl-epi32-wrong
         return I32x4(_mm_srl_epi32(v, _mm_set_epi32(0, 0, 0, count)));
     }
 
-    inline I32x4 operator+(const I32x4 &b) const {
+    I32x4 operator+(const I32x4 &b) const {
         return I32x4(_mm_add_epi32(v, b.v));
     }
 
-    inline I32x4 operator-(const I32x4 &b) const {
+    I32x4 operator-(const I32x4 &b) const {
         return I32x4(_mm_sub_epi32(v, b.v));
     }
 
-    inline I32x4 operator*(const I32x4 &b) const {
+    I32x4 operator*(const I32x4 &b) const {
         // Multiply 2 and 0.
         __m128i tmp1 = _mm_mul_epu32(v, b.v);
         // Multiply 3 and 1.
@@ -62,11 +60,11 @@ struct I32x4 {
         return I32x4(_mm_unpacklo_epi32(_mm_shuffle_epi32(tmp1, 8), _mm_shuffle_epi32(tmp2, 8)));
     }
 
-    inline void operator+=(const I32x4 &b) {
+    void operator+=(const I32x4 &b) {
         *this = *this + b;
     }
 
-    inline void operator-=(const I32x4 &b) {
+    void operator-=(const I32x4 &b) {
         *this = *this - b;
     }
 };

pathfinder/common/math/vec2.h

@@ -60,7 +60,7 @@ struct Vec2 {
     }
 
     Vec2 normalize() const {
-#ifdef PATHFINDER_DEBUG
+#ifndef NDEBUG
         if (length() == 0) {
             Logger::error("Attempted to normalize a vector of zero length. This may indicate a bug in your code!");
         }

pathfinder/common/timestamp.cpp

@@ -5,7 +5,6 @@
 #include <sstream>
 #include <string>
 
-#include "../config.h"
 #include "logger.h"
 
 namespace Pathfinder {

pathfinder/config.h

@@ -3,7 +3,6 @@
 #include "../common/io.h"
 #include "../common/logger.h"
 #include "../common/timestamp.h"
-#include "../config.h"
 #include "d3d11/renderer.h"
 #include "d3d11/scene_builder.h"
 #include "d3d9/renderer.h"

pathfinder/core/canvas.cpp

@@ -48,10 +48,10 @@ enum class PathOp {
 /// Normally, we only need one canvas to render multiple scenes.
 class Canvas {
 public:
-    explicit Canvas(Vec2I size,
-                    const std::shared_ptr<Device> &_device,
-                    const std::shared_ptr<Queue> &_queue,
-                    RenderLevel _render_level);
+    Canvas(Vec2I size,
+           const std::shared_ptr<Device> &_device,
+           const std::shared_ptr<Queue> &_queue,
+           RenderLevel _render_level);
 
     /// Set the final render target.
     void set_dst_texture(const std::shared_ptr<Texture> &new_dst_texture);

pathfinder/core/canvas.h

@@ -2,7 +2,6 @@
 
 #include "../../common/f32x4.h"
 #include "../../common/math/basic.h"
-#include "../../config.h"
 #include "../data/data.h"
 
 namespace Pathfinder {