note down embedding TODOs for arek

Author: devsh

09_GeometryCreator/main.cpp

@@ -4,6 +4,8 @@
 
 #include "common.hpp"
 
+// TODO: Arek, we should have a `nbl::examples` class inheriting from `application_templates::MonoAssetManagerAndBuiltinResourceApplication` which
+// during `onAppInitialized` also mounts correct `common/include/nbl/examples` and `common/src/nbl/examples` as folder or builtin
 class GeometryCreatorApp final : public MonoWindowApplication, public application_templates::MonoAssetManagerAndBuiltinResourceApplication
 {
 	using device_base_t = MonoWindowApplication;
@@ -55,6 +57,10 @@ class GeometryCreatorApp final : public MonoWindowApplication, public applicatio
 					.addtionalBufferOwnershipFamilies = addtionalBufferOwnershipFamilies
 				},patch
 			);
+
+			// TODO: this is plain wrong Arek
+			auto commonArchive = make_smart_refctd_ptr<system::CMountDirectoryArchive>(localInputCWD/"app_resources",smart_refctd_ptr(m_logger),m_system.get());
+			m_system->mount(make_smart_refctd_ptr<system::CMountDirectoryArchive>(localInputCWD/"../common/src/nbl/examples",smart_refctd_ptr(m_logger),m_system.get()),"nbl/examples");
 
 			auto scRes = static_cast<CDefaultSwapchainFramebuffers*>(m_surface->getSwapchainResources());
 			m_renderer = CSimpleDebugRenderer::create(m_assetMgr.get(),scRes->getRenderpass(),0,m_scene.get());

common/include/nbl/examples/geometry/CSimpleDebugRenderer.hpp

@@ -21,8 +21,6 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 			using namespace nbl::asset; \
 			using namespace nbl::video
 	public:
-		//
-		constexpr static inline auto DescriptorCount = 255;
 		//
 		struct SViewParams
 		{
@@ -85,7 +83,7 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 		{
 			EXPOSE_NABLA_NAMESPACES;
 
-			if (!!renderpass)
+			if (!renderpass)
 				return nullptr;
 			auto device = const_cast<ILogicalDevice*>(renderpass->getOriginDevice());
 			auto logger = device->getLogger();
@@ -100,9 +98,10 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 			smart_refctd_ptr<IShader> shader;
 			{
 				const auto bundle = assMan->getAsset("nbl/examples/geometry/shaders/unified.hlsl",{});
+// TODO: Arek
 				//const auto bundle = assMan->getAsset("nbl/examples/geometry/shaders/unified.spv",{});
 				const auto contents = bundle.getContents();
-				if (bundle.getAssetType()!=IAsset::ET_SHADER || contents.empty())
+				if (contents.empty() || bundle.getAssetType()!=IAsset::ET_SHADER)
 					return nullptr;
 				shader = IAsset::castDown<IShader>(contents[0]);
 				if (!shader)
@@ -124,7 +123,7 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 							// some geometries may not have particular attributes
 							.createFlags = IGPUDescriptorSetLayout::SBinding::E_CREATE_FLAGS::ECF_PARTIALLY_BOUND_BIT,
 							.stageFlags = IShader::E_SHADER_STAGE::ESS_VERTEX|IShader::E_SHADER_STAGE::ESS_FRAGMENT,
-							.count = DescriptorCount
+							.count = SInstance::SPushConstants::DescriptorCount
 						}
 					};
 					dsLayout = device->createDescriptorSetLayout(bindings);
@@ -164,9 +163,9 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 			smart_refctd_ptr<IGPUGraphicsPipeline> pipelines[PipelineType::Count] = {};
 			{
 				IGPUGraphicsPipeline::SCreationParams params[PipelineType::Count] = {};
-				params[PipelineType::BasicTriangleList].vertexShader = {.shader=shader.get(),.entryPoint="BasicTriangleListVS"};
+				params[PipelineType::BasicTriangleList].vertexShader = {.shader=shader.get(),.entryPoint="BasicVS"};
 				params[PipelineType::BasicTriangleList].fragmentShader = {.shader=shader.get(),.entryPoint="BasicFS"};
-				params[PipelineType::BasicTriangleFan].vertexShader = {.shader=shader.get(),.entryPoint="BasicTriangleFanVS"};
+				params[PipelineType::BasicTriangleFan].vertexShader = {.shader=shader.get(),.entryPoint="BasicVS"};
 				params[PipelineType::BasicTriangleFan].fragmentShader = {.shader=shader.get(),.entryPoint="BasicFS"};
 				params[PipelineType::Cone].vertexShader = {.shader=shader.get(),.entryPoint="ConeVS"};
 				params[PipelineType::Cone].fragmentShader = {.shader=shader.get(),.entryPoint="ConeFS"};
@@ -206,7 +205,7 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 				auto allocateUTB = [device,&infos](const IGeometry<const IGPUBuffer>::SDataView& view)->uint8_t
 				{
 					if (!view)
-						return DescriptorCount;
+						return SInstance::SPushConstants::DescriptorCount;
 					const auto retval = infos.size();
 					infos.emplace_back().desc = device->createBufferView(view.src, view.composed.format);
 					return retval;

common/include/nbl/examples/geometry/SPushConstants.hlsl

@@ -22,6 +22,11 @@ struct SInstanceMatrices
 
 struct SPushConstants
 {
+	// no idea if DXC still has this bug with Push Constant static variables
+#ifndef __HLSL_VERSiON
+	NBL_CONSTEXPR_STATIC_INLINE uint32_t DescriptorCount = 255;
+#endif
+
 	SInstanceMatrices matrices;
 	uint32_t positionView : 11;
 	uint32_t normalView : 10;

common/src/nbl/examples/geometry/shaders/unified.hlsl

@@ -0,0 +1,52 @@
+//
+#include "nbl/examples/geometry/SPushConstants.hlsl"
+using namespace nbl::hlsl;
+using namespace nbl::hlsl::examples::geometry_creator_scene;
+
+// for dat sweet programmable pulling
+[[vk::binding(0)]] Buffer<float32_t4> utbs[/*SPushConstants::DescriptorCount*/255];
+
+//
+[[vk::push_constant]] SPushConstants pc;
+
+//
+struct SInterpolants
+{
+	float32_t4 position : SV_Position;
+	float32_t3 color : COLOR0;
+};
+#include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
+
+//
+SInterpolants BasicVS()
+{
+    const float32_t3 position = utbs[pc.positionView].xyz;
+
+    SInterpolants output;
+    output.position = math::linalg::promoted_mul(pc.matrices.worldViewProj,position);
+    output.color = mul(pc.matrices.normalMat,utbs[pc.normalView].xyz)*0.5+promote<float32_t3>(0.5f);
+    return output;
+}
+float32_t4 BasicFS(SInterpolants input) : SV_Target0
+{
+    return float32_t4(input.color,1.f);
+}
+
+// TODO: do smooth normals on the cone
+SInterpolants ConeVS()
+{
+    const float32_t3 position = utbs[pc.positionView].xyz;
+
+    SInterpolants output;
+    output.position = math::linalg::promoted_mul(pc.matrices.worldViewProj,position);
+    output.color = mul(inverse(transpose(pc.matrices.normalMat)),position);
+    return output;
+}
+float32_t4 ConeFS(SInterpolants input) : SV_Target0
+{
+    const float32_t2x3 dViewPos_dScreen = float32_t2x3(
+        ddx(input.color),
+        ddy(input.color)
+    );
+    return float32_t4(normalize(cross(X,Y))*0.5f+promote<float32_t3>(0.5f),1.f);
+}