Merge branch 'master' of github.com:Devsh-Graphics-Programming/Nabla

Author: AnastaZIuk

3rdparty/dxc/CMakeLists.txt

@@ -139,6 +139,7 @@ if(NBL_EMBED_BUILTIN_RESOURCES)
     # SPIRV Header in builtin resources, nbl paths as aliases
     LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "unified1/spirv.h")
     LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "unified1/spirv.hpp")
+    LIST_BUILTIN_RESOURCE(SPIRV_RESOURCES_TO_EMBED "unified1/GLSL.std.450.h")
 
     ADD_CUSTOM_BUILTIN_RESOURCES(spirvBuiltinResourceData 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()

examples_tests

@@ -100,30 +100,29 @@ class IGraphicsPipeline : public IPipeline<PipelineLayoutType>
                     // TODO: check rasterization samples, etc.
                     //rp->getCreationParameters().subpasses[i]
 
-                    std::bitset<GRAPHICS_SHADER_STAGE_COUNT> stagePresence = {};
+                    core::bitflag<ICPUShader::E_SHADER_STAGE> stagePresence = {};
                     for (const auto info : shaders)
                     if (info.shader)
                     {
                         if (!extra(info))
                             return false;
                         const auto stage = info.shader->getStage();
-                        if (stage>=GRAPHICS_SHADER_STAGE_COUNT)
+                        if (stage>ICPUShader::ESS_FRAGMENT)
                             return false;
-                        const auto stageIx = hlsl::findLSB(stage);
-                        if (stagePresence.test(stageIx))
+                        if (stagePresence.hasFlags(stage))
                             return false;
-                        stagePresence.set(stageIx);
+                        stagePresence |= stage;
                     }
                     // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkGraphicsPipelineCreateInfo.html#VUID-VkGraphicsPipelineCreateInfo-stage-02096
-                    if (!stagePresence.test(ICPUShader::ESS_VERTEX))
+                    if (!stagePresence.hasFlags(ICPUShader::ESS_VERTEX))
                         return false;
                     // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkGraphicsPipelineCreateInfo.html#VUID-VkGraphicsPipelineCreateInfo-pStages-00729
                     // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkGraphicsPipelineCreateInfo.html#VUID-VkGraphicsPipelineCreateInfo-pStages-00730
-                    if (stagePresence.test(ICPUShader::ESS_TESSELLATION_CONTROL)!=stagePresence.test(ICPUShader::ESS_TESSELLATION_EVALUATION))
+                    if (stagePresence.hasFlags(ICPUShader::ESS_TESSELLATION_CONTROL)!=stagePresence.hasFlags(ICPUShader::ESS_TESSELLATION_EVALUATION))
                         return false;
                     // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkGraphicsPipelineCreateInfo.html#VUID-VkGraphicsPipelineCreateInfo-pStages-08888
                     // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkGraphicsPipelineCreateInfo.html#VUID-VkGraphicsPipelineCreateInfo-topology-08889
-                    if (stagePresence.test(ICPUShader::ESS_TESSELLATION_EVALUATION)!=(cached.primitiveAssembly.primitiveType==EPT_PATCH_LIST))
+                    if (stagePresence.hasFlags(ICPUShader::ESS_TESSELLATION_EVALUATION)!=(cached.primitiveAssembly.primitiveType==EPT_PATCH_LIST))
                         return false;
 
                     return true;

include/nbl/asset/IGraphicsPipeline.h

@@ -61,6 +61,7 @@ class NBL_API2 CHLSLCompiler final : public IShaderCompiler
 			L"-fvk-use-scalar-layout",
 			L"-Wno-c++11-extensions",
 			L"-Wno-c++1z-extensions",
+			L"-Wno-c++14-extensions",
 			L"-Wno-gnu-static-float-init",
 			L"-fspv-target-env=vulkan1.3"
 		};

include/nbl/asset/utils/CHLSLCompiler.h

@@ -13,7 +13,7 @@ namespace ext
 namespace FullScreenTriangle
 {
 
-struct VertexAttributes
+struct SVertexAttributes
 {
     [[vk::location(0)]] float32_t2 uv : TEXCOORD0;
 };

include/nbl/builtin/hlsl/ext/FullScreenTriangle/SVertexAttributes.hlsl

@@ -3,7 +3,7 @@
 // For conditions of distribution and use, see copyright notice in nabla.h
 #include <nbl/builtin/hlsl/glsl_compat/core.hlsl>
 #include <nbl/builtin/hlsl/ext/FullScreenTriangle/SVertexAttributes.hlsl>
-//#include <nbl/builtin/glsl/utils/surface_transform.glsl>
+#include <nbl/builtin/hlsl/surface_transform.h>
 
 using namespace ::nbl::hlsl;
 using namespace ::nbl::hlsl::ext::FullScreenTriangle;
@@ -19,20 +19,18 @@ const static float32_t2 tc[3] = {
     float32_t2(2.0,0.0)
 };
 
-/*
-layout (push_constant) uniform pushConstants
-{
-	layout (offset = 0) uint swapchainTransform;
-} u_pushConstants;
-*/
+[[vk::constant_id(0)]] const uint32_t SwapchainTransform = 0;
+
 
-VertexAttributes main()
+SVertexAttributes main()
 {
     using namespace ::nbl::hlsl::glsl;
 
-    VertexAttributes retval;
-    //    vec2 pos = nbl_glsl_surface_transform_applyToNDC(u_pushConstants.swapchainTransform, pos[gl_VertexIndex]);
-    spirv::Position = float32_t4(pos[gl_VertexIndex()], 0.f, 1.f);
+    spirv::Position.xy = SurfaceTransform::applyToNDC((SurfaceTransform::FLAG_BITS)SwapchainTransform,pos[gl_VertexIndex()]);
+    spirv::Position.z = 0.f;
+    spirv::Position.w = 1.f;
+
+    SVertexAttributes retval;
     retval.uv = tc[gl_VertexIndex()];
     return retval;
 }

include/nbl/builtin/hlsl/ext/FullScreenTriangle/default.vert.hlsl

@@ -16,6 +16,9 @@ namespace glsl
 {
 
 #ifdef __HLSL_VERSION
+/**
+* Generic SPIR-V
+*/
 template<typename T>
 T atomicAdd(NBL_REF_ARG(T) ptr, T value)
 {
@@ -57,6 +60,16 @@ T atomicCompSwap(NBL_REF_ARG(T) ptr, T comparator, T value)
     return spirv::atomicCompSwap<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, spv::DecorationRelaxedPrecision, value, comparator);
 }
 
+/**
+ * GLSL extended math
+ */
+template<typename SquareMatrix> // NBL_REQUIRES() extents are square
+SquareMatrix inverse(NBL_CONST_REF_ARG(SquareMatrix) mat)
+{
+    return spirv::matrixInverse(mat);
+}
+
+
 /**
  * For Vertex Shaders
  */

include/nbl/builtin/hlsl/glsl_compat/core.hlsl

@@ -7,7 +7,7 @@
 
 #ifdef __HLSL_VERSION // TODO: AnastZIuk fix public search paths so we don't choke
 #include "spirv/unified1/spirv.hpp"
-//#include "spirv/unified1/spirv.hpp" TODO: also GLSL.450.std for the extended instruction set
+#include "spirv/unified1/GLSL.std.450.h"
 #endif
 
 
@@ -47,6 +47,7 @@ static const uint32_t3 GlobalInvocationId;
 [[vk::ext_builtin_input(spv::BuiltInLocalInvocationIndex)]]
 static const uint32_t LocalInvocationIndex;
 
+//! General Operations
 template<typename T>
 T atomicAdd([[vk::ext_reference]] T ptr, uint32_t memoryScope, uint32_t memorySemantics, T value);
 template<>
@@ -124,6 +125,10 @@ template<>
 uint32_t atomicCompSwap([[vk::ext_reference]] uint32_t ptr, uint32_t memoryScope, uint32_t memSemanticsEqual, uint32_t memSemanticsUnequal, uint32_t value, uint32_t comparator);
 
 
+//! Std 450 Extended set operations
+template<typename SquareMatrix>
+[[vk::ext_instruction(GLSLstd450MatrixInverse)]]
+SquareMatrix matrixInverse(NBL_CONST_REF_ARG(SquareMatrix) mat);
 
 // Memory Semantics link here: https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html#Memory_Semantics_-id-
 

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

@@ -4,6 +4,7 @@
 #ifndef _NBL_BUILTIN_HLSL_SURFACE_TRANSFORM_INCLUDED_
 #define _NBL_BUILTIN_HLSL_SURFACE_TRANSFORM_INCLUDED_
 #include <nbl/builtin/hlsl/limits.hlsl>
+#include <nbl/builtin/hlsl/glsl_compat/core.hlsl>
 
 namespace nbl
 {
@@ -82,7 +83,7 @@ inline uint16_t2 transformedExtents(const FLAG_BITS transform, const uint16_t2 s
         default:
             break;
     }
-    return uint16_t2(0);
+    return uint16_t2(0,0);
 }
 
 inline float transformedAspectRatio(const FLAG_BITS transform, const uint16_t2 screenSize)
@@ -123,7 +124,7 @@ inline uint16_t2 applyInverseToScreenSpaceCoordinate(const FLAG_BITS transform,
         default:
             break;
     }
-    return uint16_t2(0);
+    return uint16_t2(0,0);
 }
 
 //! Use this function to apply the swapchain tranformation to the screenspace coordinate `coord` 
@@ -155,7 +156,7 @@ inline uint16_t2 applyToScreenSpaceCoordinate(const FLAG_BITS transform, const u
         default:
             break;
     }
-    return uint16_t2(0);
+    return uint16_t2(0,0);
 }
 
 //! Same as `applyToScreenSpaceCoordinate` but const NDC space
@@ -173,6 +174,7 @@ inline float32_t2 applyToNDC(const FLAG_BITS transform, const float32_t2 ndc)
 template<typename TwoColumns>
 TwoColumns applyToDerivatives(const FLAG_BITS transform, TwoColumns dDx_dDy)
 {
+    using namespace glsl; // IN HLSL mode, C++ doens't need this to access `inverse`
     return mul(inverse(transformMatrix(transform)),dDx_dDy);
 }