Merge pull request #201 from Devsh-Graphics-Programming/mitsuba_serialized

Use Mitsuba serialized Loader in Ex 12

Author: devshgraphicsprogramming

12_MeshLoaders/CMakeLists.txt

@@ -1,8 +1,18 @@
 set(NBL_INCLUDE_SERACH_DIRECTORIES
 	"${CMAKE_CURRENT_SOURCE_DIR}/include"
 )
+set(NBL_LIBRARIES)
+
+if (NBL_BUILD_MITSUBA_LOADER)
+	list(APPEND NBL_INCLUDE_SERACH_DIRECTORIES
+		"${NBL_EXT_MITSUBA_LOADER_INCLUDE_DIRS}"
+	)
+	list(APPEND NBL_LIBRARIES
+		"${NBL_EXT_MITSUBA_LOADER_LIB}"
+	)
+endif()
 
 	# TODO; Arek I removed `NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET` from the last parameter here, doesn't this macro have 4 arguments anyway !?
-nbl_create_executable_project("" "" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "" "")
+nbl_create_executable_project("" "" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "${NBL_LIBRARIES}")
 # TODO: Arek temporarily disabled cause I haven't figured out how to make this target yet
 # LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} nblExamplesGeometrySpirvBRD)

12_MeshLoaders/main.cpp

@@ -5,7 +5,7 @@
 
 #include "../3rdparty/portable-file-dialogs/portable-file-dialogs.h"
 
-#ifdef _NBL_COMPILE_WITH_MITSUBA_SERIALIZED_LOADER_
+#ifdef NBL_BUILD_MITSUBA_LOADER
 #include "nbl/ext/MitsubaLoader/CSerializedLoader.h"
 #endif
 
@@ -17,13 +17,13 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 	public:
 		inline MeshLoadersApp(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD)
 			: IApplicationFramework(_localInputCWD, _localOutputCWD, _sharedInputCWD, _sharedOutputCWD),
-			device_base_t({1280,720}, EF_UNKNOWN, _localInputCWD, _localOutputCWD, _sharedInputCWD, _sharedOutputCWD) {}
+			device_base_t({1280,720}, EF_D32_SFLOAT, _localInputCWD, _localOutputCWD, _sharedInputCWD, _sharedOutputCWD) {}
 
 		inline bool onAppInitialized(smart_refctd_ptr<ISystem>&& system) override
 		{
 			if (!asset_base_t::onAppInitialized(smart_refctd_ptr(system)))
 				return false;
-		#ifdef _NBL_COMPILE_WITH_MITSUBA_SERIALIZED_LOADER_
+		#ifdef NBL_BUILD_MITSUBA_LOADER
 			m_assetMgr->addAssetLoader(make_smart_refctd_ptr<ext::MitsubaLoader::CSerializedLoader>());
 		#endif
 			if (!device_base_t::onAppInitialized(smart_refctd_ptr(system)))
@@ -218,9 +218,9 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 
 	private:
 		// TODO: standardise this across examples, and take from `argv`
-		bool m_nonInteractiveTest = true;
+		bool m_nonInteractiveTest = false;
 
-		inline bool reloadModel()
+		bool reloadModel()
 		{
 			if (m_nonInteractiveTest) // TODO: maybe also take from argv and argc
 				m_modelPath = (sharedInputCWD/"ply/Spanner-ply.ply").string();
@@ -268,8 +268,13 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 			}
 			if (geometries.empty())
 				return false;
-			
-			auto bound = hlsl::shapes::AABB<3,double>::create();
+
+			using aabb_t = hlsl::shapes::AABB<3,double>;
+			auto printAABB = [&](const aabb_t& aabb, const char* extraMsg="")->void
+			{
+				m_logger->log("%s AABB is (%f,%f,%f) -> (%f,%f,%f)",ILogger::ELL_INFO,extraMsg,aabb.minVx.x,aabb.minVx.y,aabb.minVx.z,aabb.maxVx.x,aabb.maxVx.y,aabb.maxVx.z);
+			};
+			auto bound = aabb_t::create();
 			// convert the geometries
 			{
 				smart_refctd_ptr<CAssetConverter> converter = CAssetConverter::create({.device=m_device.get()});
@@ -344,36 +349,41 @@ class MeshLoadersApp final : public MonoWindowApplication, public BuiltinResourc
 						return false;
 					}
 				}
-
+				
+				auto tmp = hlsl::float32_t4x3(
+					hlsl::float32_t3(1,0,0),
+					hlsl::float32_t3(0,1,0),
+					hlsl::float32_t3(0,0,1),
+					hlsl::float32_t3(0,0,0)
+				);
+				core::vector<hlsl::float32_t3x4> worldTforms;
 				const auto& converted = reservation.getGPUObjects<ICPUPolygonGeometry>();
 				for (const auto& geom : converted)
 				{
-					geom.value->visitAABB([&bound](const auto& aabb)->void
-						{
-							hlsl::shapes::AABB<3,double> promoted;
-							promoted.minVx = aabb.minVx;
-							promoted.maxVx = aabb.maxVx;
-							bound = hlsl::shapes::util::union_(promoted,bound);
-						}
-					);
+					const auto promoted = geom.value->getAABB<aabb_t>();
+					printAABB(promoted,"Geometry");
+					tmp[3].x += promoted.getExtent().x;
+					const auto promotedWorld = hlsl::float64_t3x4(worldTforms.emplace_back(hlsl::transpose(tmp)));
+					const auto transformed = hlsl::shapes::util::transform(promotedWorld,promoted);
+					printAABB(transformed,"Transformed");
+					bound = hlsl::shapes::util::union_(transformed,bound);
 				}
+				printAABB(bound,"Total");
 				if (!m_renderer->addGeometries({ &converted.front().get(),converted.size() }))
 					return false;
+
+				auto worlTformsIt = worldTforms.begin();
 				for (const auto& geo : m_renderer->getGeometries())
 					m_renderer->m_instances.push_back({
-						.world = hlsl::float32_t3x4(
-							hlsl::float32_t4(1,0,0,0),
-							hlsl::float32_t4(0,1,0,0),
-							hlsl::float32_t4(0,0,1,0)
-						),
+						.world = *(worlTformsIt++),
 						.packedGeo = &geo
 					});
 			}
 
 			// get scene bounds and reset camera
 			{
 				const double distance = 0.05;
-				const auto diagonal = bound.maxVx-bound.minVx;
+				const auto diagonal = bound.getExtent();
 				{
 					const auto measure = hlsl::length(diagonal);
 					const auto aspectRatio = float(m_window->getWidth())/float(m_window->getHeight());

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

@@ -57,9 +57,9 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 			asset::SBufferBinding<const video::IGPUBuffer> indexBuffer = {};
 			uint32_t elementCount = 0;
 			// indices into the descriptor set
-			uint8_t positionView = 0;
-			uint8_t normalView = 0;
-			uint8_t uvView = 0;
+			constexpr static inline auto MissingView = hlsl::examples::geometry_creator_scene::SPushConstants::DescriptorCount;
+			uint16_t positionView = MissingView;
+			uint16_t normalView = MissingView;
 			asset::E_INDEX_TYPE indexType = asset::EIT_UNKNOWN;
 		};
 		//
@@ -72,8 +72,7 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 				return {
 					.matrices = viewParams.computeForInstance(world),
 					.positionView = packedGeo->positionView,
-					.normalView = packedGeo->normalView,
-					.uvView = packedGeo->uvView
+					.normalView = packedGeo->normalView
 				};
 			}
 
@@ -137,7 +136,7 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 							// need this trifecta of flags for `SubAllocatedDescriptorSet` to accept the binding as suballocatable
 							.createFlags = binding_flags_t::ECF_UPDATE_AFTER_BIND_BIT|binding_flags_t::ECF_UPDATE_UNUSED_WHILE_PENDING_BIT |binding_flags_t::ECF_PARTIALLY_BOUND_BIT,
 							.stageFlags = IShader::E_SHADER_STAGE::ESS_VERTEX|IShader::E_SHADER_STAGE::ESS_FRAGMENT,
-							.count = SInstance::SPushConstants::DescriptorCount
+							.count = SPackedGeometry::MissingView
 						}
 					};
 					dsLayout = device->createDescriptorSetLayout(bindings);
@@ -161,7 +160,7 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 
 			// create pipeline layout
 			const SPushConstantRange ranges[] = {{
-				.stageFlags = hlsl::ShaderStage::ESS_VERTEX,
+				.stageFlags = hlsl::ShaderStage::ESS_VERTEX|hlsl::ShaderStage::ESS_FRAGMENT,
 				.offset = 0,
 				.size = sizeof(SInstance::SPushConstants),
 			}};
@@ -246,24 +245,30 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 
 			core::vector<IGPUDescriptorSet::SWriteDescriptorSet> writes;
 			core::vector<IGPUDescriptorSet::SDescriptorInfo> infos;
-			auto allocateUTB = [&](const IGeometry<const IGPUBuffer>::SDataView& view)->uint8_t
+			bool anyFailed = false;
+			auto allocateUTB = [&](const IGeometry<const IGPUBuffer>::SDataView& view)->decltype(SubAllocatedDescriptorSet::invalid_value)
 			{
 				if (!view)
-					return SInstance::SPushConstants::DescriptorCount;
+					return SPackedGeometry::MissingView;
 				auto index = SubAllocatedDescriptorSet::invalid_value;
 				if (m_params.subAllocDS->multi_allocate(VertexAttrubUTBDescBinding,1,&index)!=0)
-					return SInstance::SPushConstants::DescriptorCount;
-				const auto retval = infos.size();
+				{
+					anyFailed = true;
+					return SPackedGeometry::MissingView;
+				}
+				const auto infosOffset = infos.size();
 				infos.emplace_back().desc = device->createBufferView(view.src,view.composed.format);
 				writes.emplace_back() = {
 					.dstSet = m_params.subAllocDS->getDescriptorSet(),
 					.binding = VertexAttrubUTBDescBinding,
 					.arrayElement = index,
 					.count = 1,
-					.info = reinterpret_cast<const IGPUDescriptorSet::SDescriptorInfo*>(retval)
+					.info = reinterpret_cast<const IGPUDescriptorSet::SDescriptorInfo*>(infosOffset)
 				};
-				return retval;
+				return index;
 			};
+			if (anyFailed)
+				device->getLogger()->log("Failed to allocate a UTB for some geometries, probably ran out of space in Descriptor Set!",system::ILogger::ELL_ERROR);
 
 			auto sizeToSet = m_geoms.size();
 			auto resetGeoms = core::makeRAIIExiter([&]()->void
@@ -308,9 +313,6 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 				out.elementCount = geom->getVertexReferenceCount();
 				out.positionView = allocateUTB(geom->getPositionView());
 				out.normalView = allocateUTB(geom->getNormalView());
-				// the first view is usually the UV
-				if (const auto& auxViews = geom->getAuxAttributeViews(); !auxViews.empty())
-					out.uvView = allocateUTB(auxViews.front());
 			}
 
 			// no geometry
@@ -340,6 +342,8 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 			deferredFree.reserve(3);
 			auto deallocate = [&](SubAllocatedDescriptorSet::value_type index)->void
 			{
+				if (index>=SPackedGeometry::MissingView)
+					return;
 				if (info.semaphore)
 					deferredFree.push_back(index);
 				else
@@ -348,14 +352,11 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 			auto geo = m_geoms.begin() + ix;
 			deallocate(geo->positionView);
 			deallocate(geo->normalView);
-			deallocate(geo->uvView);
 			m_geoms.erase(geo);
 
 			if (deferredFree.empty())
 				return;
-
-			core::vector<IGPUDescriptorSet::SDropDescriptorSet> nullify(deferredFree.size());
-			const_cast<ILogicalDevice*>(m_params.layout->getOriginDevice())->nullifyDescriptors(nullify);
+			m_params.subAllocDS->multi_deallocate(VertexAttrubUTBDescBinding,deferredFree.size(),deferredFree.data(),info);
 		}
 
 		//
@@ -386,7 +387,7 @@ class CSimpleDebugRenderer final : public core::IReferenceCounted
 				const auto* geo = instance.packedGeo;
 				cmdbuf->bindGraphicsPipeline(geo->pipeline.get());
 				const auto pc = instance.computePushConstants(viewParams);
-				cmdbuf->pushConstants(layout,hlsl::ShaderStage::ESS_VERTEX,0,sizeof(pc),&pc);
+				cmdbuf->pushConstants(layout,hlsl::ShaderStage::ESS_VERTEX|hlsl::ShaderStage::ESS_FRAGMENT,0,sizeof(pc),&pc);
 				if (geo->indexBuffer)
 				{
 					cmdbuf->bindIndexBuffer(geo->indexBuffer,geo->indexType);

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

@@ -22,15 +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
+	NBL_CONSTEXPR_STATIC_INLINE uint32_t DescriptorCount = (0x1<<16)-1;
 
 	SInstanceMatrices matrices;
-	uint32_t positionView : 11;
-	uint32_t normalView : 10;
-	uint32_t uvView : 11;
+	uint32_t positionView : 16;
+	uint32_t normalView : 16;
 };
 
 }

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

@@ -4,34 +4,47 @@ 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::binding(0)]] Buffer<float32_t4> utbs[SPushConstants::DescriptorCount];
 
 //
 [[vk::push_constant]] SPushConstants pc;
 
 //
 struct SInterpolants
 {
-	float32_t4 position : SV_Position;
-	float32_t3 meta : COLOR0;
+	float32_t4 ndc : SV_Position;
+	float32_t3 meta : COLOR1;
 };
 #include "nbl/builtin/hlsl/math/linalg/fast_affine.hlsl"
 
+float32_t3 reconstructGeometricNormal(float32_t3 pos)
+{
+    const float32_t2x3 dPos_dScreen = float32_t2x3(
+        ddx(pos),
+        ddy(pos)
+    );
+    return cross(dPos_dScreen[0],dPos_dScreen[1]);
+}
+
 //
 [shader("vertex")]
 SInterpolants BasicVS(uint32_t VertexIndex : SV_VertexID)
 {
     const float32_t3 position = utbs[pc.positionView][VertexIndex].xyz;
 
     SInterpolants output;
-    output.position = math::linalg::promoted_mul(pc.matrices.worldViewProj,position);
-    output.meta = mul(pc.matrices.normal,utbs[pc.normalView][VertexIndex].xyz);
+    output.ndc = math::linalg::promoted_mul(pc.matrices.worldViewProj,position);
+    if (pc.normalView<SPushConstants::DescriptorCount)
+        output.meta = mul(pc.matrices.normal,utbs[pc.normalView][VertexIndex].xyz);
+    else
+        output.meta = mul(inverse(transpose(pc.matrices.normal)),position);
     return output;
 }
 [shader("pixel")]
 float32_t4 BasicFS(SInterpolants input) : SV_Target0
 {
-    return float32_t4(normalize(input.meta)*0.5f+promote<float32_t3>(0.5f),1.f);
+    const float32_t3 normal = pc.normalView<SPushConstants::DescriptorCount ? input.meta:reconstructGeometricNormal(input.meta);
+    return float32_t4(normalize(normal)*0.5f+promote<float32_t3>(0.5f),1.f);
 }
 
 // TODO: do smooth normals on the cone
@@ -41,17 +54,13 @@ SInterpolants ConeVS(uint32_t VertexIndex : SV_VertexID)
     const float32_t3 position = utbs[pc.positionView][VertexIndex].xyz;
 
     SInterpolants output;
-    output.position = math::linalg::promoted_mul(pc.matrices.worldViewProj,position);
+    output.ndc = math::linalg::promoted_mul(pc.matrices.worldViewProj,position);
     output.meta = mul(inverse(transpose(pc.matrices.normal)),position);
     return output;
 }
 [shader("pixel")]
 float32_t4 ConeFS(SInterpolants input) : SV_Target0
 {
-    const float32_t2x3 dViewPos_dScreen = float32_t2x3(
-        ddx(input.meta),
-        ddy(input.meta)
-    );
-    const float32_t3 normal = cross(dViewPos_dScreen[0],dViewPos_dScreen[1]);
+    const float32_t3 normal = reconstructGeometricNormal(input.meta);
     return float32_t4(normalize(normal)*0.5f+promote<float32_t3>(0.5f),1.f);
 }