Added material compiler GLSL to mitsuba loader global metadata

Author: Crisspl

examples_tests/18.MitsubaLoader/main.cpp

@@ -438,18 +438,8 @@ int main()
 		}
 	}
 
-	auto gpuVT = core::make_smart_refctd_ptr<video::IGPUVirtualTexture>(driver, globalMeta->VT.get());
+	//auto gpuVT = core::make_smart_refctd_ptr<video::IGPUVirtualTexture>(driver, globalMeta->VT.get());
 	auto gpuds0 = driver->getGPUObjectsFromAssets(&cpuds0.get(), &cpuds0.get()+1)->front();
-	{
-		auto count = gpuVT->getDescriptorSetWrites(nullptr, nullptr, nullptr);
-
-		auto writes = core::make_refctd_dynamic_array<core::smart_refctd_dynamic_array<video::IGPUDescriptorSet::SWriteDescriptorSet>>(count.first);
-		auto info = core::make_refctd_dynamic_array<core::smart_refctd_dynamic_array<video::IGPUDescriptorSet::SDescriptorInfo>>(count.second);
-
-		gpuVT->getDescriptorSetWrites(writes->data(), info->data(), gpuds0.get());
-
-		driver->updateDescriptorSets(writes->size(), writes->data(), 0u, nullptr);
-	}
 
     auto gpuds1layout = driver->getGPUObjectsFromAssets(&ds1layout, &ds1layout+1)->front();
 

include/irr/ext/MitsubaLoader/CGlobalMitsubaMetadata.h

@@ -26,6 +26,11 @@ class CGlobalMitsubaMetadata : public core::IReferenceCounted
 		core::vector<CElementSensor> sensors;
 		core::vector<CElementEmitter> emitters;
 		core::smart_refctd_ptr<asset::ICPUVirtualTexture> VT;
+
+		//has to go after #version and before required user-provided descriptors and functions
+		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;
 };
 
 

src/irr/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -876,6 +876,9 @@ asset::SAssetBundle CMitsubaLoader::loadAsset(io::IReadFile* _file, const asset:
 			getBuiltinAsset<asset::ICPUSpecializedShader, asset::IAsset::ET_SPECIALIZED_SHADER>(VERTEX_SHADER_CACHE_KEY, m_manager),
 			std::move(fragShader)
 		);
+		ctx.globalMeta->materialCompilerGLSL_declarations = compResult.fragmentShaderSource_declarations;
+		ctx.globalMeta->materialCompilerGLSL_source = compResult.fragmentShaderSource;
+
 		for (const SContext::shape_ass_type& mesh_ : meshes)
 		{
 			// need const_cast because core::set has only const iterators (or maybe we should reconsider if const smart_refctd_ptr::operator-> should return const ptr)