Merge pull request #573 from Devsh-Graphics-Programming/merge_kpentaris_hlsl

Update SPIRV-Headers fork and merge test from kpentaris

Author: devshgraphicsprogramming

3rdparty/dxc/CMakeLists.txt

@@ -172,8 +172,8 @@ if(NBL_EMBED_BUILTIN_RESOURCES)
 	include("${NBL_ROOT_PATH}/src/nbl/builtin/utils.cmake")
 
     # SPIRV Header in builtin resources, nbl paths as aliases
-    LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "1.2/spirv.h")
-    LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "1.2/spirv.hpp")
+    LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "unified1/spirv.h")
+    LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "unified1/spirv.hpp")
 
     ADD_CUSTOM_BUILTIN_RESOURCES(dxcBuiltinResourceData SPIRV_RESOURCES_TO_EMBED "${_SPIRV_BR_BUNDLE_SEARCH_DIRECTORY_}" "spirv" "spirv::builtin" "${_SPIRV_BR_OUTPUT_DIRECTORY_HEADER_}" "${_SPIRV_BR_OUTPUT_DIRECTORY_SOURCE_}" "STATIC" "INTERNAL")
 endif()

3rdparty/dxc/dxc

@@ -0,0 +1,153 @@
+// Copyright (C) 2022 - DevSH Graphics Programming Sp. z O.O.
+// This file is part of the "Nabla Engine".
+// For conditions of distribution and use, see copyright notice in nabla.h
+#ifndef _NBL_BUILTIN_HLSL_BINOPS_INCLUDED_
+#define _NBL_BUILTIN_HLSL_BINOPS_INCLUDED_
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace binops
+{
+template<typename T>
+struct bitwise_and
+{
+    T operator()(const T lhs, const T rhs)
+    {
+        return lhs&rhs;
+    }
+    
+    static T identity()
+    {
+        return ~0;
+    }
+};
+
+template<typename T>
+struct bitwise_or
+{
+    T operator()(const T lhs, const T rhs)
+    {
+        return lhs|rhs;
+    }
+    
+    static T identity()
+    {
+        return 0;
+    }
+};
+
+template<typename T>
+struct bitwise_xor
+{
+    T operator()(const T lhs, const T rhs)
+    {
+        return lhs^rhs;
+    }
+    
+    static T identity()
+    {
+        return 0;
+    }
+};
+
+template<typename T>
+struct add
+{
+    T operator()(const T lhs, const T rhs)
+    {
+        return lhs+rhs;
+    }
+    
+    static T identity()
+    {
+        return 0;
+    }
+};
+
+template<typename T>
+struct mul
+{
+    T operator()(const T lhs, const T rhs)
+    {
+        return lhs*rhs;
+    }
+    
+    static T identity()
+    {
+        return 1;
+    }
+};
+
+template<typename T>
+struct comparator_lt_t
+{
+    bool operator()(const T lhs, const T rhs)
+    {
+        return lhs<rhs;
+    }
+};
+
+template<typename T>
+struct comparator_gt_t
+{
+    bool operator()(const T lhs, const T rhs)
+    {
+        return lhs>rhs;
+    }
+};
+
+template<typename T>
+struct comparator_lte_t
+{
+    bool operator()(const T lhs, const T rhs)
+    {
+        return lhs<=rhs;
+    }
+};
+
+template<typename T>
+struct comparator_gte_t
+{
+    bool operator()(const T lhs, const T rhs)
+    {
+        return lhs>=rhs;
+    }
+};
+
+template<typename T>
+struct min
+{
+    T operator()(const T lhs, const T rhs)
+    {
+        comparator_lt_t<T> comp;
+        return comp(lhs, rhs) ? lhs : rhs;
+    }
+
+    static T identity()
+    {
+        return ~0;
+    }
+};
+
+template<typename T>
+struct max
+{
+    T operator()(const T lhs, const T rhs)
+    {
+        comparator_gt_t<T> comp;
+        return comp(lhs, rhs) ? lhs : rhs;
+    }
+
+    static T identity()
+    {
+        return 0;
+    }
+};
+
+}
+}
+}
+
+#endif

examples_tests

@@ -4,7 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_ARITHMETIC_INCLUDED_
 #define _NBL_BUILTIN_HLSL_GLSL_COMPAT_SUBGROUP_ARITHMETIC_INCLUDED_
 
-#include "nbl/builtin/hlsl/spirv_intrinsics/subgroup/arithmetic.hlsl"
+#include "nbl/builtin/hlsl/spirv_intrinsics/subgroup_arithmetic.hlsl"
 
 namespace nbl
 {

include/nbl/builtin/hlsl/binops.hlsl

@@ -5,7 +5,7 @@
 #define _NBL_BUILTIN_HLSL_SPIRV_INTRINSICS_CORE_INCLUDED_
 
 
-#include "spirv/1.2/spirv.hpp"
+#include "spirv/unified1/spirv.hpp"
 
 
 namespace nbl 

include/nbl/builtin/hlsl/glsl_compat/subgroup_arithmetic.hlsl

@@ -5,7 +5,7 @@
 namespace nbl::video
 {
 
-static constexpr uint32_t MinimumVulkanApiVersion = VK_MAKE_API_VERSION(0, 1, 1, 0);
+static constexpr uint32_t MinimumVulkanApiVersion = VK_MAKE_API_VERSION(0, 1, 3, 0);
 
 static inline asset::E_FORMAT getFormatFromVkFormat(VkFormat in)
 {

include/nbl/builtin/hlsl/spirv_intrinsics/core.hlsl

@@ -110,7 +110,7 @@ static tcpp::TInputStreamUniquePtr getInputStreamInclude(
         std::string re(IShaderCompiler::PREPROC_DIRECTIVE_DISABLER);
         re.append("error ");
         re.append(requestedSource);
-        re.append(" not found");
+        re.append(" not found\n");
         includeStack.push_back(includeStack.back());
         return tcpp::TInputStreamUniquePtr(new tcpp::StringInputStream(re));
     }
@@ -260,7 +260,7 @@ std::string CHLSLCompiler::preprocessShader(std::string&& code, IShader::E_SHADE
             }
             else
             {
-                return tcpp::TInputStreamUniquePtr(new tcpp::StringInputStream(std::string("#error No include handler")));
+                return tcpp::TInputStreamUniquePtr(new tcpp::StringInputStream(std::string("#error No include handler\n")));
             }
         };
         info.mOnPopIncludeCallback = [&]() {
@@ -379,7 +379,8 @@ core::smart_refctd_ptr<ICPUShader> CHLSLCompiler::compileToSPIRV(const char* cod
         L"-Zpr", // Packs matrices in row-major order by default
         L"-enable-16bit-types",
         L"-fvk-use-scalar-layout",
-        L"-Wno-c++11-extensions"
+        L"-Wno-c++11-extensions",
+        L"-fspv-target-env=vulkan1.3"
     };
 
     // If a custom SPIR-V optimizer is specified, use that instead of DXC's spirv-opt.

include/nbl/video/CVulkanCommon.h

@@ -180,6 +180,22 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/workgroup/fft.glsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/workgroup/shuffle.glsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/workgroup/shuffle_relative.glsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/workgroup/vote.glsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/subgroup/arithmetic_portability.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/subgroup/arithmetic_portability_impl.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/subgroup/ballot.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/subgroup/basic.hlsl")
+#glsl compat
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/glsl_compat/core.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/glsl_compat/subgroup_arithmetic.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/glsl_compat/subgroup_ballot.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/glsl_compat/subgroup_basic.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/glsl_compat/subgroup_shuffle.hlsl")
+#spirv intrinsics
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/core.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/subgroup_arithmetic.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/subgroup_ballot.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/subgroup_basic.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/spirv_intrinsics/subgroup_shuffle.hlsl")
 #transform_tree
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/transform_tree/global_transform_update.comp")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "glsl/transform_tree/global_transform_and_normal_matrix_update.comp")
@@ -261,11 +277,11 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/cpp_compat/intrinsics.h")
 
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/bit.hlsl")
 
-# TODO: add `glsl_compat`, `spirv_intrinsics` and `subgroup` contents
-
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/math/quadrature/gauss_legendre/gauss_legendre.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/math/quadrature/gauss_legendre/impl.hlsl")
 
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/binops.hlsl")
+
 macro(NBL_ADD_BUILTIN_RESOURCES _TARGET_) # internal & Nabla only, must be added with the macro to properly propagate scope
 	ADD_CUSTOM_BUILTIN_RESOURCES("${_TARGET_}" NBL_RESOURCES_TO_EMBED "${NBL_ROOT_PATH}/include" "nbl/builtin" "nbl::builtin" "${NBL_ROOT_PATH_BINARY}/include" "${NBL_ROOT_PATH_BINARY}/src" "STATIC" "INTERNAL")
 endmacro()