Vulkan impl

.github/workflows/build.yml

@@ -30,27 +30,27 @@ jobs:
           cd external/dawn
           cp scripts/standalone.gclient .gclient
           gclient sync
-      - name: Cache
+      - name: Create build dir
+        run: |
+          mkdir build
+      - name: Fetch cache
         id: cmake-cache
         uses: actions/cache@v2
         with:
           path: |
             build/
-          key: ${{ runner.os }}-master
-      - name: Create build dir
-        if: steps.cmake-cache.outputs.cache-hit != 'true'
-        run: |
-          mkdir build
+          key: ${{ runner.os }}-${{ runner.arch }}-${{ github.ref_name }}
       - name: Build
         run: |
           export MONO_PROJECT=/usr/include/mono-2.0/
 
           cd build
-          cmake .. -DTEMPEH_ENABLE_TEST=ON
-          cmake --build .
+          cmake .. -DTEMPEH_ENABLE_TEST=ON -DTEMPEH_ENABLE_GPU_TEST=ON
+          cmake --build . -j 4
       - name: Run test
         run: |
-          ./build/test/tempeh_core_test
+          echo "No test at the moment"
+          #./build/test/tempeh_core_test
   build_windows:
     name: Build Windows
     runs-on: windows-latest
@@ -74,24 +74,24 @@ jobs:
           cd external\dawn
           copy scripts\standalone.gclient .gclient
           gclient sync
-      - name: Cache
+      - name: Create build dir
+        run: |
+          New-Item -ItemType Directory -Force -Path build
+      - name: Fetch cache
         id: cmake-cache
         uses: actions/cache@v2
         with:
           path: |
             build/
-          key: ${{ runner.os }}-master
-      - name: Create build dir
-        if: steps.cmake-cache.outputs.cache-hit != 'true'
-        run: |
-          mkdir build
+          key: ${{ runner.os }}-${{ runner.arch }}-${{ github.ref_name }}
       - name: Build
         run: |
           $env:MONO_INCLUDE_DIR = "C:\Program Files\Mono\include\mono-2.0\"
 
           cd build
-          cmake .. -DTEMPEH_ENABLE_TEST=ON -G "Ninja"
-          cmake --build .
+          cmake .. -DTEMPEH_ENABLE_TEST=ON -DTEMPEH_ENABLE_GPU_TEST=ON -G "Ninja"
+          cmake --build . -j 4
       - name: Run test
         run: |
-          .\build\test\tempeh_core_test.exe
+          echo "No test at the moment"
+          #.\build\test\tempeh_core_test.exe

.gitmodules

@@ -34,3 +34,9 @@
 [submodule "external/SPIRV-Cross"]
 	path = external/SPIRV-Cross
 	url = https://github.com/KhronosGroup/SPIRV-Cross.git
+[submodule "external/GSL"]
+	path = external/GSL
+	url = https://github.com/microsoft/GSL.git
+[submodule "external/SPIRV-Reflect"]
+	path = external/SPIRV-Reflect
+	url = https://github.com/KhronosGroup/SPIRV-Reflect.git

CMakeLists.txt

@@ -3,51 +3,60 @@
 project("tempeh_engine"
 	LANGUAGES C CXX)
 
+include(Macros.cmake)
+
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
-option(TEMPEH_ENABLE_TEST "Test" OFF)
+option(TEMPEH_ENABLE_TEST "Enable unit test" OFF)
+option(TEMPEH_ENABLE_GPU_TEST "Enable unit test for GPU backends (requires TEMPEH_ENABLE_TEST to be enabled)" OFF)
 
 add_subdirectory("external")
 
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
+find_package(Vulkan)
+
 # https://github.com/izenecloud/cmake/blob/master/SetCompilerWarningAll.cmake
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  # Use the highest warning level for Visual Studio.
-  set(CMAKE_CXX_WARNING_LEVEL 4)
-  if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  else(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-  endif(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-  # Disable C++ exceptions.
-  string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
-  # Disable RTTI.
-  string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
-else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  # Use -Wall for clang and gcc.
-  if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-  endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
-  # Use -Wextra for clang and gcc.
-  if(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
-  endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
-  # Use -Werror for clang and gcc.
-  #if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
-  #  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-  #endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
-  # Disable C++ exceptions.
-  string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
-  # Disable RTTI.
-  string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
-endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    # Use the highest warning level for Visual Studio.
+    set(CMAKE_CXX_WARNING_LEVEL 4)
+    if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+        string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    else(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+    endif(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+
+    # Ensure compiler conformance compatibility.
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-")
+
+    # Disable C++ exceptions.
+    string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+
+    # Disable RTTI.
+    string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    # Use -Wall for clang and gcc.
+    if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+    endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
+    # Use -Wextra for clang and gcc.
+    if(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+    endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
+    # Disable C++ exceptions.
+    string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+    # Disable RTTI.
+    string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+endif()
 
 add_subdirectory("engine")
 add_subdirectory("editor")
 add_subdirectory("test/vulkan_backend")
-add_subdirectory("test")
+
+if(TEMPEH_ENABLE_TEST)
+    add_subdirectory("test")
+endif()

CMakeSettings.json

@@ -8,11 +8,40 @@
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",
-      "buildCommandArgs": "",
+      "buildCommandArgs": "-j 4",
       "ctestCommandArgs": "",
+      "addressSanitizerEnabled": false,
       "variables": [
         {
           "name": "TEMPEH_TEST",
+          "value": "False",
+          "type": "BOOL"
+        },
+        {
+          "name": "TEMPEH_ENABLE_TEST",
+          "value": "True",
+          "type": "BOOL"
+        },
+        {
+          "name": "TEMPEH_ENABLE_GPU_TEST",
+          "value": "True",
+          "type": "BOOL"
+        }
+      ]
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-j 4",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": [
+        {
+          "name": "TEMPEH_ENABLE_GPU_TEST",
           "value": "True",
           "type": "BOOL"
         },

Macros.cmake

@@ -0,0 +1,34 @@
+function(tempeh_add_shader_module _TARGET_NAME _STAGE _SRC)
+    if(_STAGE STREQUAL "VERTEX")
+        set(_STAGE "vert")
+    elseif(_STAGE STREQUAL "FRAGMENT")
+        set(_STAGE "frag")
+    else()
+        message(FATAL_ERROR "Unknown shader stage")
+    endif()
+    get_filename_component(_SRC_FILE "${_SRC}" ABSOLUTE)
+    # message("${Vulkan_GLSLANG_VALIDATOR_EXECUTABLE} -S ${_STAGE} --target-env spirv1.0 -o ${CMAKE_BINARY_DIR} ${_SRC_FILE}")
+    add_custom_target(${_TARGET_NAME}
+        COMMAND ${Vulkan_GLSLANG_VALIDATOR_EXECUTABLE} -V -S ${_STAGE} --target-env spirv1.0 -o "${CMAKE_CURRENT_BINARY_DIR}/${_TARGET_NAME}.spv" "${_SRC_FILE}"
+        BYPRODUCTS "${CMAKE_CURRENT_BINARY_DIR}/${_TARGET_NAME}.spv"
+        DEPENDS "${_SRC_FILE}"
+        SOURCES "${_SRC_FILE}")
+endfunction()
+
+function(tempeh_add_dependency_group)
+    if(ARGC EQUAL 0)
+        message(FATAL_ERROR "No name given for dependency group")
+    endif()
+
+    if(ARGC LESS 2)
+        message(FATAL_ERROR "Dependency group must at least contain 1 dependency")
+    endif()
+
+    set(_GROUP_NAME ${ARGV0})
+    add_custom_target(${_GROUP_NAME})
+    list(POP_FRONT ARGN) # pop the first argument
+
+    foreach(_I IN LISTS ARGN)
+        add_dependencies(${_GROUP_NAME} ${_I})
+    endforeach()
+endfunction()

editor/CMakeLists.txt

@@ -18,7 +18,7 @@ set(TEMPEH_ENGINE_EDITOR_SOURCES
 	"${CMAKE_SOURCE_DIR}/external/imgui/backends/imgui_impl_wgpu.cpp"
 	"${CMAKE_SOURCE_DIR}/external/imgui/backends/imgui_impl_glfw.cpp")
 
-add_executable("tempeh_engine_editor"
+add_executable(tempeh_engine_editor
 	${TEMPEH_ENGINE_EDITOR_SOURCES}
 	${TEMPEH_ENGINE_EDITOR_HEADERS}
 	"src/gui/panel.hpp"
@@ -27,30 +27,30 @@ add_executable("tempeh_engine_editor"
 	"src/gui/window_menubar_panel.cpp"
 	"src/gui/window_menubar_panel.hpp")
 
-target_compile_definitions("tempeh_engine_editor"
+target_compile_definitions(tempeh_engine_editor
 	PUBLIC SENTRY_DSN="https://[email protected]/6143604")
 
-target_include_directories("tempeh_engine_editor"
+target_include_directories(tempeh_engine_editor
 	#PUBLIC "../common"
 	PUBLIC "${CMAKE_SOURCE_DIR}/external/dawn/src"
 	PUBLIC "$ENV{MONO_INCLUDE_DIR}"
 	PUBLIC ${TEMPEH_COMMON_INCLUDE})
 
-target_link_libraries("tempeh_engine_editor"
+target_link_libraries(tempeh_engine_editor
 	# Private, because anyone ain't gonna touch the editor
-	PRIVATE "glfw"
-	PRIVATE "tempeh_common"
-	PRIVATE "tempeh_core"
-	PRIVATE "tempeh_log"
-	PRIVATE "tempeh_math"
-	PRIVATE "spdlog::spdlog"
-	#PUBLIC "sentry::sentry"
-	PRIVATE "webgpu_dawn"
-	PRIVATE "dawn_native"
-	PRIVATE "dawn_utils"
-	PRIVATE "dawn_proc"
-	PRIVATE "dawncpp"
-	PRIVATE "dawncpp_headers"
-	PRIVATE "imgui")
+	PRIVATE glfw
+	PRIVATE tempeh_common
+	PRIVATE tempeh_core
+	PRIVATE tempeh_log
+	PRIVATE tempeh_math
+	PRIVATE spdlog::spdlog
+	#PUBLIC sentry::sentry
+	PRIVATE webgpu_dawn
+	PRIVATE dawn_native
+	PRIVATE dawn_utils
+	PRIVATE dawn_proc
+	PRIVATE dawncpp
+	PRIVATE dawncpp_headers
+	PRIVATE imgui)
 
 add_dependencies(tempeh_engine_editor webgpu_headers_gen)

editor/src/gui/panel.hpp

@@ -3,7 +3,7 @@
 
 #include <tempeh/common/typedefs.hpp>
 
-INTERFACE class Panel
+class Panel
 {
 public:
 	virtual void draw() = 0;

engine/common/CMakeLists.txt

@@ -1,8 +1,9 @@
 add_library(tempeh_common INTERFACE)
+
 target_include_directories(
     tempeh_common
     INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
+
 target_link_libraries(
     tempeh_common
-    INTERFACE "magic_enum"
-)
+    INTERFACE "magic_enum")

engine/common/include/tempeh/common/os.hpp

@@ -6,24 +6,24 @@
 #elif __APPLE__
 #   include <TargetConditionals.h>
 #   if TARGET_IPHONE_SIMULATOR
-#      error "Unimplemented"
+#      error "Unimplemented target operating system"
 #   elif TARGET_OS_MACCATALYST
-#      error "Unimplemented"
+#      error "Unimplemented target operating system"
 #   elif TARGET_OS_IPHONE
-#      error "Unimplemented"
+#      error "Unimplemented target operating system"
 #   elif TARGET_OS_MAC
-#      error "Unimplemented"
+#      error "Unimplemented target operating system"
 #   else
 #      error "Unknown Apple platform"
 #   endif
 #elif __linux__
 #   define TEMPEH_OS_LINUX
 #elif __unix__
-#   error "Unimplemented"
+#   error "Unimplemented target operating system"
 #elif defined(_POSIX_VERSION)
-#   error "Unimplemented"
+#   error "Unimplemented target operating system"
 #else
-#   error "Unknown compiler"
+#   error "Unknown OS"
 #endif
 
 #endif

engine/common/include/tempeh/common/traits.hpp

@@ -0,0 +1,21 @@
+#ifndef _TEMPEH_UTIL_TRAITS_HPP
+#define _TEMPEH_UTIL_TRAITS_HPP
+
+#include <type_traits>
+
+namespace Tempeh
+{
+    template<bool Condition>
+    using Requires = std::enable_if_t<Condition, bool>;
+
+    template<typename T>
+    using RequiresDefaultConstructible = Requires<std::is_default_constructible_v<T>>;
+
+    template<typename T>
+    using RequiresCopyConstructible = Requires<std::is_copy_constructible_v<T>>;
+
+    template<typename T>
+    using RequiresMoveConstructible = Requires<std::is_move_constructible_v<T>>;
+}
+
+#endif