Remove old stale builtin GLSL files from builtin SPec Shaders

Also add the new HLSL shaders for FSTri extension

Author: devshgraphicsprogramming

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

@@ -0,0 +1,25 @@
+// Copyright (C) 2018-2024 - 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_HLSL_EXT_FULL_SCREEN_TRIANGLE_S_VERTEX_ATTRIBUTE_H_
+#define _NBL_HLSL_EXT_FULL_SCREEN_TRIANGLE_S_VERTEX_ATTRIBUTE_H_
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace ext
+{
+namespace FullScreenTriangle
+{
+
+struct VertexAttributes
+{
+    [[vk::location(0)]] float32_t2 uv;
+};
+
+}
+}
+}
+}
+#endif

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

@@ -0,0 +1,48 @@
+// Copyright (C) 2018-2024 - 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
+#include <nbl/builtin/hlsl/ext/FullScreenTriangle/SVertexAttributes.hlsl>
+//#include <nbl/builtin/glsl/utils/surface_transform.glsl>
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace ext
+{
+namespace FullScreenTriangle
+{
+
+const static float32_t2 pos[3] = {
+    float32_t2(-1.0,-1.0),
+    float32_t2(-1.0, 3.0),
+    float32_t2( 3.0,-1.0)
+};
+const static float32_t2 tc[3] = {
+    float32_t2(0.0,0.0),
+    float32_t2(0.0,2.0),
+    float32_t2(2.0,0.0)
+};
+
+/*
+layout (push_constant) uniform pushConstants
+{
+	layout (offset = 0) uint swapchainTransform;
+} u_pushConstants;
+*/
+
+VertexAttributes main()
+{
+    using namespace nbl::hlsl::glsl;
+
+    VertexAttributes retval;
+//    vec2 pos = nbl_glsl_surface_transform_applyToNDC(u_pushConstants.swapchainTransform, pos[gl_VertexIndex]);
+    spirv::Position = vec4(pos[gl_VertexIndex()], 0.f, 1.f);
+    retval.uv = tc[gl_VertexIndex()];
+    return retval;
+}
+
+}
+}
+}
+}

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

@@ -57,11 +57,19 @@ T atomicCompSwap(NBL_REF_ARG(T) ptr, T comparator, T value)
     return spirv::atomicCompSwap<T>(ptr, spv::ScopeDevice, spv::DecorationRelaxedPrecision, spv::DecorationRelaxedPrecision, value, comparator);
 }
 
+/**
+ * For Vertex Shaders
+ */
+ // TODO: Extemely annoying that HLSL doesn't have references, so we can't transparently alias the variables as `&` :(
+//void gl_Position() {spirv::}
+uint32_t gl_VertexIndex() {return spirv::VertexIndex;}
+uint32_t gl_InstanceIndex() {return spirv::InstanceIndex;}
+
 /**
  * For Compute Shaders
  */
 
-// TODO: Extemely annoying that HLSL doesn't have referencies, so we can't transparently alias the variables as `const&` :(
+// TODO: Extemely annoying that HLSL doesn't have references, so we can't transparently alias the variables as `const&` :(
 uint32_t3 gl_NumWorkGroups() {return spirv::NumWorkGroups;}
 // TODO: DXC BUG prevents us from defining this!
 uint32_t3 gl_WorkGroupSize();

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

@@ -18,9 +18,21 @@ namespace hlsl
 #ifdef __HLSL_VERSION
 namespace spirv
 {
+//! General
 [[vk::ext_builtin_input(spv::BuiltInHelperInvocation)]]
 static const bool HelperInvocation;
 
+//! Vertex Inputs
+[[vk::ext_builtin_input(spv::BuiltInVertexIndex)]]
+static const uint32_t VertexIndex;
+[[vk::ext_builtin_input(spv::BuiltInInstanceIndex)]]
+static const uint32_t InstanceIndex;
+
+//! Vertex and friends
+[[vk::ext_builtin_output(spv::BuiltInPosition)]]
+static float32_t4 Position;
+
+//! Compute Shader Builtins
 [[vk::ext_builtin_input(spv::BuiltInNumWorkgroups)]]
 static const uint32_t3 NumWorkGroups;
 // TODO: Doesn't work, find out why and file issue on DXC!

include/nbl/builtin/specialized_shader/fullscreentriangle.vert

@@ -223,72 +223,6 @@ void IAssetManager::insertBuiltinAssets()
 		insertBuiltinAssetIntoCache(bundle);
 	};
 
-	// materials
-	{
-		//
-		auto buildInGLSLShader = [&](	core::smart_refctd_ptr<const system::IFile>&& data,
-									asset::IShader::E_SHADER_STAGE type,
-									std::initializer_list<const char*> paths) -> void
-		{
-            auto buffer = core::make_smart_refctd_ptr<asset::ICPUBuffer>(data->getSize() + 1u);
-            memcpy(buffer->getPointer(), data->getMappedPointer(), data->getSize());
-            char* bufferAsChar = reinterpret_cast<char*>(buffer->getPointer());
-            bufferAsChar[data->getSize()] = '\0';
-
-            auto shader = core::make_smart_refctd_ptr<asset::ICPUShader>(std::move(buffer), type, asset::IShader::E_CONTENT_TYPE::ECT_GLSL, paths.begin()[0]);
-			for (auto& path : paths)
-				addBuiltInToCaches(std::move(shader), path);
-		};
-		auto fileSystem = getSystem();
-
-        auto loadBuiltinData = [&](const std::string _path) -> core::smart_refctd_ptr<const nbl::system::IFile>
-        {
-            nbl::system::ISystem::future_t<core::smart_refctd_ptr<nbl::system::IFile>> future;
-            fileSystem->createFile(future, system::path(_path), core::bitflag(nbl::system::IFileBase::ECF_READ) | nbl::system::IFileBase::ECF_MAPPABLE);
-            if (future.wait())
-                return future.copy();
-            return nullptr;
-        };
-
-		buildInGLSLShader(loadBuiltinData("nbl/builtin/specialized_shader/fullscreentriangle.vert"),
-			asset::IShader::ESS_VERTEX,
-			{
-                "nbl/builtin/specialized_shader/fullscreentriangle.vert"
-            });
-		buildInGLSLShader(loadBuiltinData("nbl/builtin/material/lambertian/singletexture/specialized_shader.vert"),
-			asset::IShader::ESS_VERTEX,
-			{
-                "nbl/builtin/material/lambertian/singletexture/specialized_shader.vert",
-                "nbl/builtin/material/debug/vertex_uv/specialized_shader.vert"
-            });
-		buildInGLSLShader(loadBuiltinData("nbl/builtin/material/lambertian/singletexture/specialized_shader.frag"), // it somehow adds an extra "tt" raw string to the end of the returned value, beware
-			asset::IShader::ESS_FRAGMENT, 
-			{
-                "nbl/builtin/material/lambertian/singletexture/specialized_shader.frag"
-            });
-
-		buildInGLSLShader(loadBuiltinData("nbl/builtin/material/debug/vertex_normal/specialized_shader.vert"),
-			asset::IShader::ESS_VERTEX,
-			{
-                "nbl/builtin/material/debug/vertex_normal/specialized_shader.vert"});
-		buildInGLSLShader(loadBuiltinData("nbl/builtin/material/debug/vertex_color/specialized_shader.vert"),
-			asset::IShader::ESS_VERTEX,
-			{
-                "nbl/builtin/material/debug/vertex_color/specialized_shader.vert"
-            });
-		buildInGLSLShader(loadBuiltinData("nbl/builtin/material/debug/vertex_uv/specialized_shader.frag"),
-			asset::IShader::ESS_FRAGMENT,
-			{   
-                "nbl/builtin/material/debug/vertex_uv/specialized_shader.frag"
-            });
-		buildInGLSLShader(loadBuiltinData("nbl/builtin/material/debug/vertex_normal/specialized_shader.frag"),
-			asset::IShader::ESS_FRAGMENT,
-			{
-                "nbl/builtin/material/debug/vertex_normal/specialized_shader.frag",
-                "nbl/builtin/material/debug/vertex_color/specialized_shader.frag"
-            });
-	}
-
     /*
         SBinding for UBO - basic view parameters.
     */

src/nbl/asset/IAssetManager.cpp

@@ -15,7 +15,6 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "shader/loader/gltf/fragment_impl.g
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "shader/loader/gltf/uv.frag")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "shader/loader/gltf/color.frag")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "shader/loader/gltf/no_uv_color.frag")
-LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "specialized_shader/fullscreentriangle.vert")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "material/lambertian/singletexture/specialized_shader.vert")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "material/lambertian/singletexture/specialized_shader.frag")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "material/debug/vertex_color/specialized_shader.vert")
@@ -299,5 +298,8 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/workgroup/ballot.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/workgroup/broadcast.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/workgroup/scratch_size.hlsl")
 LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/workgroup/shared_scan.hlsl")
+#Extensions
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/ext/FullScreenTriangle/SVertexAttributes.hlsl")
+LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/ext/FullScreenTriangle/default.vert.hlsl")
 
 ADD_CUSTOM_BUILTIN_RESOURCES(nblBuiltinResourceData NBL_RESOURCES_TO_EMBED "${NBL_ROOT_PATH}/include" "nbl/builtin" "nbl::builtin" "${NBL_ROOT_PATH_BINARY}/include" "${NBL_ROOT_PATH_BINARY}/src" "STATIC" "INTERNAL")