Merge remote-tracking branch 'origin/master' into nsct

Author: Hazardu

3rdparty/dxc/dxc

@@ -18,7 +18,7 @@ namespace glsl
 template<typename T>
 T atomicAdd(NBL_REF_ARG(T) ptr, T value)
 {
-    return spirv::atomicAnd<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
+    return spirv::atomicAdd<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, value);
 }
 template<typename T>
 T atomicAnd(NBL_REF_ARG(T) ptr, T value)

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

@@ -98,7 +98,7 @@ template<bool Exclusive, uint16_t ItemCount, class BallotAccessor, class Arithme
 uint16_t ballotScanBitCount(NBL_REF_ARG(BallotAccessor) ballotAccessor, NBL_REF_ARG(ArithmeticAccessor) arithmeticAccessor)
 {
     const uint16_t subgroupIndex = SubgroupContiguousIndex();
-    const uint16_t bitfieldIndex = impl::getDWORD(subgroupIndex);
+    const uint16_t bitfieldIndex = getDWORD(subgroupIndex);
     const uint32_t localBitfield = ballotAccessor.get(bitfieldIndex);
 
     static const uint16_t DWORDCount = impl::ballot_dword_count<ItemCount>::value;
@@ -111,7 +111,7 @@ uint16_t ballotScanBitCount(NBL_REF_ARG(BallotAccessor) ballotAccessor, NBL_REF_
         arithmeticAccessor.set(subgroupIndex,count);
     arithmeticAccessor.workgroupExecutionAndMemoryBarrier();
     count = arithmeticAccessor.get(bitfieldIndex);
-    return uint16_t(countbits(localBitfield&(Exclusive ? glsl::gl_SubgroupLtMask():glsl::gl_SubgroupLeMask())[0])+count);
+    return uint16_t(countbits(localBitfield&(Exclusive ? glsl::gl_SubgroupLtMask():glsl::gl_SubgroupLeMask())[getDWORD(glsl::gl_SubgroupInvocationID())])+count);
 }
 }
 

include/nbl/builtin/hlsl/workgroup/arithmetic.hlsl

@@ -440,6 +440,9 @@ core::smart_refctd_ptr<ICPUShader> CHLSLCompiler::compileToSPIRV(const char* cod
         hlslOptions
     );
 
+    if (arg_storage)
+        delete[] arg_storage;
+
     if (!compileResult.objectBlob)
     {
         return nullptr;

src/nbl/asset/utils/CHLSLCompiler.cpp

@@ -75,6 +75,7 @@ struct preprocessing_hooks final : public boost::wave::context_policies::default
         typename ContextT::token_type const& act_token
     )
     {
+        hash_token_occurences++;
         auto optionStr = option.get_value().c_str();
         if (strcmp(optionStr,"shader_stage")==0) 
         {

src/nbl/asset/utils/waveContext.h

@@ -1 +1 @@
-add_subdirectory(nsc)
+add_subdirectory(nsc)

tools/CMakeLists.txt

@@ -0,0 +1,5 @@
+set(NBL_EXTRA_SOURCES
+	# TODO: Cypi list extra sources if you need
+)
+
+nbl_create_executable_project("${NBL_EXTRA_SOURCES}" "" "" "" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")

tools/ndt/CMakeLists.txt

@@ -0,0 +1,24 @@
+{
+  "enableParallelBuild": true,
+  "threadsPerBuildProcess" : 2,
+  "isExecuted": true,
+  "scriptPath": "test/test.py",
+  "cmake": {
+    "configurations": [ "Release", "Debug", "RelWithDebInfo" ],
+    "buildModes": [],
+    "requiredOptions": []
+  },
+  "profiles": [
+    {
+      "backend": "vulkan",
+      "platform": "windows",
+      "buildModes": [],
+      "runConfiguration": "Release",
+      "gpuArchitectures": [],
+	    "inputs": [
+	      "test/config/release.json.template"
+	    ]
+    }
+  ],
+  "inputs": []
+}

tools/ndt/__init__.py

@@ -0,0 +1,60 @@
+// TODO: Cypi
+
+
+// nsc input/simple_shader.hlsl -T ps_6_0 -E Main -Fo output/shader.ps
+
+#include "nbl/system/IApplicationFramework.h"
+
+#include <iostream>
+#include <cstdlib>
+
+
+
+class ShaderCompiler final : public system::IApplicationFramework
+{
+    using base_t = system::IApplicationFramework;
+
+public:
+    using base_t::base_t;
+
+    bool onAppInitialized(smart_refctd_ptr<ISystem>&& system) override
+    {
+        if (!base_t::onAppInitialized(std::move(system)))
+            return false;
+        
+        auto argc = argv.size();
+
+        core::vector<std::string> arguments(argv + 1, argv + argc);
+
+        for (auto i=0; i<argc; i++)
+        {
+            if (argv[i] == "-no-nbl-builtins")
+            {
+                no_nbl_builtins = true;
+                break;
+            }
+        }
+
+        std::string command = "dxc.exe";
+        for (std::string arg : arguments)
+        {
+            command.append(" ").append(arg);
+        }
+
+        int execute = std::system(command.c_str());
+
+        std::cout << "-no-nbl-builtins - " << no_nbl_builtins;
+
+
+        return true;
+    }
+
+
+    void workLoopBody() override {}
+
+    bool keepRunning() override { return false; }
+
+
+private:
+    bool no_nbl_builtins{false};
+};