Faster backend init, Agility SDK, other changes

.clang-format

@@ -42,7 +42,6 @@ SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles: false
 SpacesInCStyleCastParentheses: false
-SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 #SpacesInSquareBrackets: false
 UseTab: Never
@@ -57,6 +56,3 @@ CommentPragmas: '!Api.*'
 
 # Includes
 IncludeBlocks: Preserve
-
-# Closing namespace comments
-FixNamespaceComments: true

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 project(PhantasmHardwareInterface)
 
 
@@ -17,6 +17,12 @@ option(PHI_BACKEND_D3D12 "enable DirectX 12 backend" ON)
 # this dll is included in extern/win32_pix_runtime/bin/ and is automatically copied if enabled
 option(PHI_ENABLE_D3D12_PIX "enable DirectX 12 PIX integration" ON)
 
+# Enables D3D12 Agility SDK (allowing use of newer D3D12 runtimes than the one shipped with the OS)
+# if enabled, expects an include path visible to PHI with the Agility SDK headers, prefixed with D3D12AgilitySDK/
+# meaning PHI will use #include <D3D12AgilitySDK/d3d12.h> instead of #include <d3d12.h>
+# (exporting the required symbols and providing the DLLs and headers must be done by the user)
+option(PHI_ENABLE_D3D12_AGILITY "enable DirectX 12 Agility SDK integration" OFF)
+
 # Enables support for surface creation from SDL_Window*
 option(PHI_ENABLE_SDL2 "enable SDL2 integration" ON)
 
@@ -47,7 +53,7 @@ if (PHI_BACKEND_VULKAN)
     else()
         set(phi_found_vulkan_sdk_version "")
         _get_vulkan_sdk_version_number_from_folder(${Vulkan_INCLUDE_DIRS}, phi_found_vulkan_sdk_version)
-        message(STATUS "[phantasm hardware interface] found Vulkan SDK ${phi_found_vulkan_sdk_version}")
+        message(STATUS "[phantasm hardware interface] found Vulkan SDK '${phi_found_vulkan_sdk_version}' at ${Vulkan_INCLUDE_DIRS}")
     endif()
 endif()
 
@@ -84,7 +90,6 @@ arcana_add_library(PHI phantasm-hardware-interface SOURCES HEADERS)
 target_include_directories(phantasm-hardware-interface
     PUBLIC
         src/
-    PRIVATE
         "${CMAKE_CURRENT_SOURCE_DIR}/extern/renderdoc_app/include/"
 )
 
@@ -109,6 +114,8 @@ if (NOT MSVC)
     # Used in sse_hash.hh
     # Could be made optional if necessary
     target_compile_options(phantasm-hardware-interface PRIVATE -msse4.2)
+else()
+    target_compile_options(phantasm-hardware-interface PRIVATE /WX)
 endif()
 
 # =========================================
@@ -138,15 +145,27 @@ if (PHI_BACKEND_D3D12)
         target_compile_definitions(phantasm-hardware-interface PUBLIC PHI_HAS_PIX USE_PIX)
 
         # copy the dll to the runtime output folder post-build
+		# we are on MSVC meaning CMAKE_RUNTIME_OUTPUT_DIRECTORY does not contain the /Debug or /Release ending, add it manually
         set(PHI_D3D12_PIX_DLL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/extern/win32_pix_runtime/bin/WinPixEventRuntime.dll")
         add_custom_command(
             TARGET phantasm-hardware-interface POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy_if_different
             "${PHI_D3D12_PIX_DLL_PATH}"
-            "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+            "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIGURATION>"
         )
+		message(STATUS "[phantasm hardware interface] D3D12 PIX integration enabled")
     endif()
 
+	# Agility SDK
+	if (PHI_ENABLE_D3D12_AGILITY)
+		# set defines
+		target_compile_definitions(phantasm-hardware-interface 
+		PUBLIC 
+			PHI_HAS_D3D12_AGILITY
+		)
+		message(STATUS "[phantasm hardware interface] D3D12 Agility SDK integration enabled")
+	endif()
+
 else()
     message(STATUS "[phantasm hardware interface] D3D12 backend disabled")
 endif()

cmake/FindPackageHandleStandardArgs.cmake

@@ -326,6 +326,8 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   unset(FOUND_COMPONENTS_MSG)
   unset(MISSING_COMPONENTS_MSG)
 
+  set(COMPONENT_MSG "")
+
   if(FPHSA_HANDLE_COMPONENTS)
     foreach(comp ${${_NAME}_FIND_COMPONENTS})
       if(${_NAME}_${comp}_FOUND)
@@ -425,7 +427,8 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   endif ()
 
   if(VERSION_OK)
-    string(APPEND DETAILS "[v${${FPHSA_VERSION_VAR}}(${${_NAME}_FIND_VERSION})]")
+    # NOTE(Kunstwald): Commented out, these variables are always undefined for Vulkan
+    # string(APPEND DETAILS "[v${${FPHSA_VERSION_VAR}}(${${_NAME}_FIND_VERSION})]")
   else()
     set(${_NAME}_FOUND FALSE)
   endif()

src/phantasm-hardware-interface/Backend.cc

@@ -5,6 +5,18 @@
 
 #include <phantasm-hardware-interface/arguments.hh>
 
+phi::init_status phi::Backend::initializeParallel(backend_config const& /*config*/, uint32_t /*idx*/)
+{
+    // do nothing by default
+    return init_status::success;
+}
+
+phi::init_status phi::Backend::initializeQueues(backend_config const& /*config*/)
+{
+    // do nothing by default
+    return init_status::success;
+}
+
 phi::handle::resource phi::Backend::createTexture(
     phi::format format, tg::isize2 size, uint32_t mips, texture_dimension dim, uint32_t depth_or_array_size, bool allow_uav, char const* debug_name)
 {
@@ -79,4 +91,17 @@ phi::handle::resource phi::Backend::createResourceFromInfo(const phi::arg::resou
         return handle::null_resource;
     }
     CC_UNREACHABLE("invalid type");
-}
+}
+
+phi::handle::pipeline_state phi::Backend::createComputePipelineState(arg::shader_arg_shapes arg_shapes, arg::shader_binary shader, bool hasRootConsts)
+{
+    arg::compute_pipeline_state_description desc = {};
+    for (auto const& arg : arg_shapes)
+    {
+        desc.root_signature.shader_arg_shapes.push_back(arg);
+    }
+    desc.root_signature.has_root_constants = hasRootConsts;
+    desc.shader = shader;
+
+    return createComputePipelineState(desc);
+}