Merge pull request #36 from Crisspl/nabla-master

Mitsuba Loader utilities.

`material_compiler_compatibility_impl` is kinda a lame name for this header, but lets not perfect get in the way of good.

Author: devshgraphicsprogramming

examples_tests/18.MitsubaLoader/main.cpp

@@ -183,7 +183,7 @@ int main()
 		asset::CQuantNormalCache* qnc = am->getMeshManipulator()->getQuantNormalCache();
 
 		am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CSerializedLoader>(am));
-		am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am));
+		am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am,fs));
 
 		std::string filePath = "../../media/mitsuba/staircase2.zip";
 	//#define MITSUBA_LOADER_TESTS
@@ -294,6 +294,11 @@ int main()
 	video::IVideoDriver* driver = device->getVideoDriver();
 	asset::IAssetManager* am = device->getAssetManager();
 
+	// look out for this!!!
+	// when added, CMitsubaLoader inserts its own include loader into GLSLCompiler
+	// thats why i have to add it again here (after device recreation) to be able to compile shaders
+	am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am, device->getFileSystem()));
+
 	core::smart_refctd_ptr<asset::ICPUDescriptorSetLayout> ds2layout;
 	{
 		asset::ICPUDescriptorSetLayout::SBinding bnd[4];

examples_tests/22.RaytracedAO/main.cpp

@@ -43,7 +43,7 @@ int main()
 		asset::IAssetManager* am = device->getAssetManager();
 
 		am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CSerializedLoader>(am));
-		am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am));
+		am->addAssetLoader(core::make_smart_refctd_ptr<nbl::ext::MitsubaLoader::CMitsubaLoader>(am, fs));
 
 		//std::string filePath = "../../media/mitsuba/daily_pt.xml";
 		std::string filePath = "../../media/mitsuba/staircase2.zip";

examples_tests/tmp/normalCache101010.sse

@@ -585,6 +585,8 @@ class IAssetManager : public core::IReferenceCounted, public core::QuitSignallin
         //! @returns 0xdeadbeefu on failure or 0-based index on success.
         uint32_t addAssetLoader(core::smart_refctd_ptr<IAssetLoader>&& _loader)
         {
+            _loader->initialize();
+
             // there's no way it ever fails, so no 0xdeadbeef return
             const char** exts = _loader->getAssociatedFileExtensions();
             size_t extIx = 0u;

include/nbl/asset/IAssetManager.h

@@ -0,0 +1,80 @@
+#ifndef _NBL_BUILTIN_GLSL_EXT_MITSUBA_LOADER_DESCRIPTORS_INCLUDED_
+#define _NBL_BUILTIN_GLSL_EXT_MITSUBA_LOADER_DESCRIPTORS_INCLUDED_
+
+#define _NBL_VT_DESCRIPTOR_SET 0
+#define _NBL_VT_PAGE_TABLE_BINDING 0
+
+#define _NBL_VT_FLOAT_VIEWS_BINDING 1 
+#define _NBL_VT_FLOAT_VIEWS_COUNT _NBL_EXT_MITSUBA_LOADER_VT_STORAGE_VIEW_COUNT
+#define _NBL_VT_FLOAT_VIEWS
+
+#define _NBL_VT_INT_VIEWS_BINDING NotApplicable
+#define _NBL_VT_INT_VIEWS_COUNT 0
+#define _NBL_VT_INT_VIEWS
+
+#define _NBL_VT_UINT_VIEWS_BINDING NotApplicable
+#define _NBL_VT_UINT_VIEWS_COUNT 0
+#define _NBL_VT_UINT_VIEWS
+#include <nbl/builtin/glsl/virtual_texturing/descriptors.glsl>
+
+layout(set = 0, binding = 2, std430) restrict readonly buffer VT_PrecomputedStuffSSBO
+{
+    uint pgtab_sz_log2;
+    float vtex_sz_rcp;
+    float phys_pg_tex_sz_rcp[_NBL_VT_MAX_PAGE_TABLE_LAYERS];
+    uint layer_to_sampler_ix[_NBL_VT_MAX_PAGE_TABLE_LAYERS];
+} VT_precomputed;
+
+layout(set = 0, binding = 3, std430) restrict readonly buffer INSTR_BUF
+{
+    nbl_glsl_MC_instr_t data[];
+} instr_buf;
+layout(set = 0, binding = 4, std430) restrict readonly buffer BSDF_BUF
+{
+    nbl_glsl_MC_bsdf_data_t data[];
+} bsdf_buf;
+#include <nbl/builtin/glsl/ext/MitsubaLoader/instance_data_struct.glsl>
+layout(set = 0, binding = 5, row_major, std430) readonly restrict buffer InstDataBuffer {
+    nbl_glsl_ext_Mitsuba_Loader_instance_data_t data[];
+} InstData;
+layout(set = 0, binding = 6, std430) restrict readonly buffer PREFETCH_INSTR_BUF
+{
+    nbl_glsl_MC_prefetch_instr_t data[];
+} prefetch_instr_buf;
+
+// Note: this GLSL header defines just those 3 material compiler functions.
+// The rest of them must still be defined by the user!
+nbl_glsl_MC_instr_t nbl_glsl_MC_fetchInstr(in uint ix)
+{
+    return instr_buf.data[ix];
+}
+nbl_glsl_MC_prefetch_instr_t nbl_glsl_MC_fetchPrefetchInstr(in uint ix)
+{
+    return prefetch_instr_buf.data[ix];
+}
+nbl_glsl_MC_bsdf_data_t nbl_glsl_MC_fetchBSDFData(in uint ix)
+{
+    return bsdf_buf.data[ix];
+}
+
+uint nbl_glsl_VT_layer2pid(in uint layer)
+{
+    return VT_precomputed.layer_to_sampler_ix[layer];
+}
+uint nbl_glsl_VT_getPgTabSzLog2()
+{
+    return VT_precomputed.pgtab_sz_log2;
+}
+float nbl_glsl_VT_getPhysPgTexSzRcp(in uint layer)
+{
+    return VT_precomputed.phys_pg_tex_sz_rcp[layer];
+}
+float nbl_glsl_VT_getVTexSzRcp()
+{
+    return VT_precomputed.vtex_sz_rcp;
+}
+#define _NBL_USER_PROVIDED_VIRTUAL_TEXTURING_FUNCTIONS_
+
+#include <nbl/builtin/glsl/virtual_texturing/functions.glsl/7/8>
+
+#endif

include/nbl/builtin/glsl/ext/MitsubaLoader/material_compiler_compatibility_impl.glsl

@@ -35,6 +35,8 @@ class CGlobalMitsubaMetadata : public core::IReferenceCounted
 		std::string materialCompilerGLSL_declarations;
 		//has to go after required user-provided descriptors and functions and before the rest of shader (especially entry point function)
 		std::string materialCompilerGLSL_source;
+
+		uint32_t getVTStorageViewCount() const { return VT->getFloatViews().size(); }
 };
 
 

include/nbl/ext/MitsubaLoader/CGlobalMitsubaMetadata.h

@@ -33,10 +33,13 @@ class CMitsubaLoader : public asset::IAssetLoader
 		friend class CMitsubaMaterialCompilerFrontend;
 	public:
 		//! Constructor
-		CMitsubaLoader(asset::IAssetManager* _manager);
+		CMitsubaLoader(asset::IAssetManager* _manager, io::IFileSystem* _fs);
+
+		void initialize() override;
 
 	protected:
 		asset::IAssetManager* m_manager;
+		io::IFileSystem* m_filesystem;
 
 		//! Destructor
 		virtual ~CMitsubaLoader() = default;

include/nbl/ext/MitsubaLoader/CMitsubaLoader.h

@@ -24,21 +24,9 @@ class CGLSLVirtualTexturingBuiltinIncludeLoader : public IGLSLEmbeddedIncludeLoa
         const char* getVirtualDirectoryName() const override { return "glsl/virtual_texturing/"; }
 
     private:
-	    static core::vector<std::string> parseArgumentsFromPath(const std::string& _path)
-	    {
-		    core::vector<std::string> args;
-
-		    std::stringstream ss{ _path };
-		    std::string arg;
-		    while (std::getline(ss, arg, '/'))
-			    args.push_back(std::move(arg));
-
-		    return args;
-	    }
-
 		static std::string getVTfunctions(const std::string& _path)
 		{
-			auto args = parseArgumentsFromPath(_path.substr(_path.find_last_of('glsl')+2, _path.npos));
+			auto args = parseArgumentsFromPath(_path.substr(_path.rfind(".glsl")+6, _path.npos));
 			if (args.size()<2u)
 				return {};
 

src/nbl/asset/CGLSLVirtualTexturingBuiltinIncludeLoader.h

@@ -185,12 +185,6 @@ void IAssetManager::addLoadersAndWriters()
 #ifdef _NBL_COMPILE_WITH_GLI_WRITER_
 	addAssetWriter(core::make_smart_refctd_ptr<asset::CGLIWriter>());
 #endif
-
-
-    for (size_t i = 0; i < m_loaders.vector.size(); i++)
-    {
-        m_loaders.vector[i]->initialize();
-    }
 }
 
 

src/nbl/asset/IAssetManager.cpp

@@ -28,6 +28,17 @@ class IGLSLEmbeddedIncludeLoader : public IBuiltinIncludeLoader
 			return {{std::regex{pattern},std::move(tmp)}};
 		}
 
+		static core::vector<std::string> parseArgumentsFromPath(const std::string& _path)
+		{
+			core::vector<std::string> args;
+
+			std::stringstream ss{ _path };
+			std::string arg;
+			while (std::getline(ss, arg, '/'))
+				args.push_back(std::move(arg));
+
+			return args;
+		}
 
 		io::IFileSystem* fs;