Fixed a few things in mitsuba loader/material compiler

Author: Crisspl

include/nbl/asset/material_compiler/CMaterialCompilerGLSLBackendCommon.h

@@ -641,8 +641,8 @@ class CMaterialCompilerGLSLBackendCommon
 				vt->shrink();
 
 				bool success = true;
-				for (commit_t& cm : pendingCommits)
-					success &= commit(cm);
+				//for (commit_t& cm : pendingCommits)
+				//	success &= commit(cm);
 				pendingCommits.clear();
 				return success;
 			}

include/nbl/ext/MitsubaLoader/CElementBSDF.h

@@ -220,11 +220,11 @@ class CElementBSDF : public IElement
 		size_t childCount = 0u;
 		CElementBSDF* bsdf[MaxChildCount] = { nullptr };
 	};
-		struct AllCoating : RoughSpecularBase, TransmissiveBase, MetaBSDF
+		struct AllCoating : MetaBSDF, RoughSpecularBase, TransmissiveBase
 		{
 			_NBL_STATIC_INLINE_CONSTEXPR size_t MaxChildCount = 1u;
 
-			AllCoating() : RoughSpecularBase(0.1f), TransmissiveBase("bk7","air"), MetaBSDF(), thickness(1.f), sigmaA(0.f) {}
+			AllCoating() : MetaBSDF(), RoughSpecularBase(0.1f), TransmissiveBase("bk7","air"), thickness(1.f), sigmaA(0.f) {}
 
 			inline AllCoating& operator=(const AllCoating& other)
 			{

include/nbl/ext/MitsubaLoader/CMitsubaMaterialCompilerFrontend.h

@@ -31,6 +31,8 @@ class CMitsubaMaterialCompilerFrontend
     tex_ass_type getTexture(const CElementTexture* _element) const;
     tex_ass_type getTexture(const std::string& _key, const CElementTexture* _element, float _scale) const;
 
+    tex_ass_type getErrorTexture() const;
+
     IRNode* createIRNode(asset::material_compiler::IR* ir, const CElementBSDF* _bsdf);
 
 public:
@@ -40,7 +42,7 @@ class CMitsubaMaterialCompilerFrontend
         IRNode* back;
     };
 
-    CMitsubaMaterialCompilerFrontend(const SContext* _ctx) : m_loaderContext(_ctx) {}
+    explicit CMitsubaMaterialCompilerFrontend(const SContext* _ctx) : m_loaderContext(_ctx) {}
 
     front_and_back_t compileToIRTree(asset::material_compiler::IR* ir, const CElementBSDF* _bsdf);
 };

include/nbl/ext/MitsubaLoader/CMitsubaMetadata.h

@@ -5,6 +5,7 @@
 #ifndef __NBL_C_MITSUBA_METADATA_H_INCLUDED__
 #define __NBL_C_MITSUBA_METADATA_H_INCLUDED__
 
+#include "nbl/core/compile_config.h"
 #include "nbl/asset/metadata/IAssetMetadata.h"
 
 #include "nbl/ext/MitsubaLoader/SContext.h"
@@ -67,6 +68,9 @@ class CMitsubaMetadata : public asset::IAssetMetadata
 					CElementEmitter frontEmitter; // type is invalid if not used
 					CElementEmitter backEmitter; // type is invalid if not used
 					CMitsubaMaterialCompilerFrontend::front_and_back_t bsdf;
+#if defined(_NBL_DEBUG) || defined(_NBL_RELWITHDEBINFO)
+					std::string bsdf_id;
+#endif
 				};
 
 				core::SRange<const SInstanceAuxilaryData> m_instanceAuxData;
@@ -162,7 +166,14 @@ class CMitsubaMetadata : public asset::IAssetMetadata
 				{
 					auto& inst = it->second;
 					(m_instanceStorageIt++)->worldTform = inst.tform;
-					*(m_instanceAuxStorageIt++) = {inst.emitter.front,inst.emitter.back,inst.bsdf};
+					*(m_instanceAuxStorageIt++) = {
+						inst.emitter.front,
+						inst.emitter.back,
+						inst.bsdf
+#if defined(_NBL_DEBUG) || defined(_NBL_RELWITHDEBINFO)
+						,inst.bsdf_id
+#endif
+					};
 				}
 				meta->m_instances = { instanceStorageBegin,m_instanceStorageIt };
 				meta->m_instanceAuxData = { instanceAuxStorageBegin,m_instanceAuxStorageIt };

include/nbl/macros.h

@@ -62,7 +62,8 @@
 #if defined(_NBL_DEBUG) || defined(_NBL_RELWITHDEBINFO)
 // TODO even though it is defined in RWDI build, _DEBUG #define is not defined in msvc (in rwdi) so debug break is not triggered anyway
 // idk what about other compilers
-#define _NBL_DEBUG_BREAK_IF( _CONDITION_ ) _NBL_BREAK_IF(_CONDITION_)
+//#define _NBL_DEBUG_BREAK_IF( _CONDITION_ ) _NBL_BREAK_IF(_CONDITION_)
+#define _NBL_DEBUG_BREAK_IF( _CONDITION_ )
 #else
 #define _NBL_DEBUG_BREAK_IF( _CONDITION_ )
 #endif

src/nbl/asset/interchange/CImageLoaderTGA.cpp

@@ -105,10 +105,12 @@ bool CImageLoaderTGA::isALoadableFileFormat(io::IReadFile* _file) const
 	// 16 bytes for "TRUEVISION-XFILE", 17th byte is '.', and the 18th byte contains '\0'.
 	if (strncmp(footer.Signature, "TRUEVISION-XFILE.", 18u) != 0)
 	{
-		os::Printer::log("Invalid (non-TGA) file!", ELL_ERROR);
+		//os::Printer::log("Invalid (non-TGA) file!", _file->getFileName().c_str(), ELL_ERROR);
 		return false;
 	}
 
+	// why did it even check gamma in isALoadableFileFormat ???
+	/*
 	float gamma;
 
 	if (footer.ExtensionOffset == 0)
@@ -133,6 +135,7 @@ bool CImageLoaderTGA::isALoadableFileFormat(io::IReadFile* _file) const
 		// TODO - pass gamma to LoadAsset()?
 		// Actually I think metadata will be in used here in near future
 	}
+	*/
 
     _file->seek(prevPos);
 

src/nbl/asset/material_compiler/CMaterialCompilerGLSLBackendCommon.cpp

@@ -691,7 +691,6 @@ std::pair<instr_t, const IR::INode*> CInterpreter::processSubtree(IR* ir, const
 
 			assert(node->children.count == 1u);
 			auto* coated = const_cast<IR::INode*>(node->children[0]);
-			out_next = IR::INode::createChildrenArray(coat, coated);
 
 			instr = instr_stream::OP_COATING;
 
@@ -700,9 +699,19 @@ std::pair<instr_t, const IR::INode*> CInterpreter::processSubtree(IR* ir, const
 				instr = instr_stream::OP_INVALID;
 			const IR::CBSDFNode::E_TYPE coated_bxdf = static_cast<const IR::CBSDFNode*>(coated)->type;
 			const bool is_coated_diffuse = (coated_bxdf == IR::CBSDFNode::ET_MICROFACET_DIFFUSE || coated_bxdf == IR::CBSDFNode::ET_MICROFACET_DIFFTRANS);
-			assert(is_coated_diffuse);
+			//assert(is_coated_diffuse);
+			// we dont support coating over non-diffuse materials
+			// so we ignore coating layer and process only the coated material
 			if (!is_coated_diffuse)
-				instr = instr_stream::OP_INVALID;
+			{
+				auto retval = processSubtree(ir, coated, out_next, cache);
+				instr = retval.first;
+				tree = retval.second;
+			}
+			else
+			{
+				out_next = IR::INode::createChildrenArray(coat, coated);
+			}
 		}
 			break;
 		case IR::CBSDFNode::ET_MICROFACET_DIELECTRIC:

src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -1221,6 +1221,9 @@ auto CMitsubaLoader::genBSDFtreeTraversal(SContext& ctx, const CElementBSDF* _bs
 			switch (bsdf->type)
 			{
 			case CElementBSDF::COATING:
+				for (uint32_t i = 0u; i < bsdf->coating.childCount; ++i)
+					stack.push(bsdf->coating.bsdf[i]);
+				break;
 			case CElementBSDF::ROUGHCOATING:
 			case CElementBSDF::BUMPMAP:
 			case CElementBSDF::BLEND_BSDF:
@@ -1427,9 +1430,9 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
 
 #ifdef DEBUG_MITSUBA_LOADER
 				//@Crisspl TODO No way how to fix it for reporting the `inst.bsdf_id`
-				//os::Printer::log("Debug print front BSDF with id = ", inst.bsdf_id, ELL_INFORMATION);
-				//ofile << "Debug print front BSDF with id = " << inst.bsdf_id << std::endl;
-				//_ctx.backend.debugPrint(ofile, streams, _compResult, &_ctx.backend_ctx);
+				os::Printer::log("Debug print front BSDF with id = ", inst.bsdf_id, ELL_INFORMATION);
+				ofile << "Debug print front BSDF with id = " << inst.bsdf_id << std::endl;
+				_ctx.backend.debugPrint(ofile, streams, _compResult, &_ctx.backend_ctx);
 #endif
 				const auto emissive = inst.frontEmitter.type==CElementEmitter::AREA ? inst.frontEmitter.area.radiance:core::vectorSIMDf(0.f);
 				instData.material.front = impl_backendToGLSLStream(emissive,streams);
@@ -1441,9 +1444,9 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
 
 #ifdef DEBUG_MITSUBA_LOADER
 				//@Crisspl TODO No way how to fix it for reporting the `inst.bsdf_id`
-				//os::Printer::log("Debug print back BSDF with id = ", inst.bsdf_id, ELL_INFORMATION);
-				//ofile << "Debug print back BSDF with id = " << inst.bsdf_id << std::endl;
-				//_ctx.backend.debugPrint(ofile, streams, _compResult, &_ctx.backend_ctx);
+				os::Printer::log("Debug print back BSDF with id = ", inst.bsdf_id, ELL_INFORMATION);
+				ofile << "Debug print back BSDF with id = " << inst.bsdf_id << std::endl;
+				_ctx.backend.debugPrint(ofile, streams, _compResult, &_ctx.backend_ctx);
 #endif
 				const auto emissive = inst.backEmitter.type==CElementEmitter::AREA ? inst.backEmitter.area.radiance:core::vectorSIMDf(0.f);
 				instData.material.back = impl_backendToGLSLStream(emissive,streams);

src/nbl/ext/MitsubaLoader/CMitsubaMaterialCompilerFrontend.cpp

@@ -77,6 +77,26 @@ namespace MitsubaLoader
         return { nullptr, nullptr, _scale };
     }
 
+    auto CMitsubaMaterialCompilerFrontend::getErrorTexture() const -> tex_ass_type
+    {
+        constexpr const char* ERR_TEX_CACHE_NAME = "nbl/builtin/image_view/dummy2d";
+        constexpr const char* ERR_SMPLR_CACHE_NAME = "nbl/builtin/sampler/default";
+
+        asset::IAsset::E_TYPE types[2]{ asset::IAsset::ET_IMAGE_VIEW, asset::IAsset::ET_TERMINATING_ZERO };
+        auto bundle = m_loaderContext->override_->findCachedAsset(ERR_TEX_CACHE_NAME, types, m_loaderContext->inner, 0u);
+        assert(!bundle.getContents().empty()); // this shouldnt ever happen since ERR_TEX_CACHE_NAME is builtin asset
+        
+        auto view = core::smart_refctd_ptr_static_cast<asset::ICPUImageView>(bundle.getContents().begin()[0]);
+
+        types[0] = asset::IAsset::ET_SAMPLER;
+        auto sbundle = m_loaderContext->override_->findCachedAsset(ERR_SMPLR_CACHE_NAME, types, m_loaderContext->inner, 0u);
+        assert(!sbundle.getContents().empty()); // this shouldnt ever happen since ERR_SMPLR_CACHE_NAME is builtin asset
+
+        auto smplr = core::smart_refctd_ptr_static_cast<asset::ICPUSampler>(sbundle.getContents().begin()[0]);
+
+        return { view, smplr, 1.f };
+    }
+
     auto CMitsubaMaterialCompilerFrontend::createIRNode(asset::material_compiler::IR* ir, const CElementBSDF* _bsdf) -> IRNode*
     {
         using namespace asset;
@@ -352,7 +372,11 @@ auto CMitsubaMaterialCompilerFrontend::compileToIRTree(asset::material_compiler:
             if (tex.image)
                 dst = std::move(tex);
             else
-                dst = IR::INode::color_t(1.f, 0.f, 0.f); // red in case of no texture
+            {
+                // error texture in case of not-found texture
+                std::tie(tex.image, tex.sampler, tex.scale) = getErrorTexture();
+                dst = std::move(tex);
+            }
         }
         else dst = src.value.vvalue;
     };
@@ -387,11 +411,11 @@ auto CMitsubaMaterialCompilerFrontend::compileToIRTree(asset::material_compiler:
 
             if (parent.bsdf->isMeta())
             {
-                const auto& meta = parent.bsdf->meta_common;
-                for (uint32_t i = 0u; i < meta.childCount; ++i)
+                const uint32_t child_count = (parent.bsdf->type == CElementBSDF::COATING) ? parent.bsdf->coating.childCount : parent.bsdf->meta_common.childCount;
+                for (uint32_t i = 0u; i < child_count; ++i)
                 {
                     SNode child_node;
-                    child_node.bsdf = meta.bsdf[i];
+                    child_node.bsdf = (parent.bsdf->type == CElementBSDF::COATING) ? parent.bsdf->coating.bsdf[i] : parent.bsdf->meta_common.bsdf[i];
                     child_node.parent_ix = parent.type() == CElementBSDF::TWO_SIDED ? parent.parent_ix : bfs.size();
                     child_node.twosided = (child_node.type() == CElementBSDF::TWO_SIDED) || parent.twosided;
                     child_node.child_num = (parent.type() == CElementBSDF::TWO_SIDED) ? parent.child_num : i;