make mitsuba loader use BaseInstance instead of push constants for the material stream offset.

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/raytraceCommon.glsl

@@ -156,73 +156,4 @@ void storeAccumulation(in vec3 color, in ivec2 coord)
 #endif
 
 
-#endif
-
-/*
-///
-instr_stream_t getEvalStream(in MC_precomputed_t precomp)
-{
-	instr_stream_t stream;
-	if (precomp.frontface)
-	{
-		stream.offset = InstData.data[InstanceIndex].front_instr_offset;
-		stream.count = InstData.data[InstanceIndex].front_rem_pdf_count;
-	}
-	else
-	{
-		stream.offset = InstData.data[InstanceIndex].back_instr_offset;
-		stream.count = InstData.data[InstanceIndex].back_rem_pdf_count;
-	}
-	return stream;
-}
-//rem'n'pdf and eval use the same instruction stream
-instr_stream_t getRemAndPdfStream(in MC_precomputed_t precomp)
-{
-	return getEvalStream(precomp);
-}
-instr_stream_t getGenChoiceStream(in MC_precomputed_t precomp)
-{
-	instr_stream_t stream;
-	if (precomp.frontface)
-	{
-		stream.offset = InstData.data[InstanceIndex].front_instr_offset + InstData.data[InstanceIndex].front_rem_pdf_count;
-		stream.count =  InstData.data[InstanceIndex].front_genchoice_count;
-	}
-	else
-	{
-		stream.offset = InstData.data[InstanceIndex].back_instr_offset + InstData.data[InstanceIndex].back_rem_pdf_count;
-		stream.count = InstData.data[InstanceIndex].back_genchoice_count;
-	}
-	return stream;
-}
-instr_stream_t getTexPrefetchStream(in MC_precomputed_t precomp)
-{
-	instr_stream_t stream;
-	if (precomp.frontface)
-	{
-		stream.offset = InstData.data[InstanceIndex].front_prefetch_offset;
-		stream.count = InstData.data[InstanceIndex].front_prefetch_count;
-	}
-	else
-	{
-		stream.offset = InstData.data[InstanceIndex].back_prefetch_offset;
-		stream.count = InstData.data[InstanceIndex].back_prefetch_count;
-	}
-	return stream;
-}
-instr_stream_t getNormalPrecompStream(in MC_precomputed_t precomp)
-{
-	instr_stream_t stream;
-	if (precomp.frontface)
-	{
-		stream.offset = InstData.data[InstanceIndex].front_instr_offset + InstData.data[InstanceIndex].front_rem_pdf_count + InstData.data[InstanceIndex].front_genchoice_count;
-		stream.count = InstData.data[InstanceIndex].front_nprecomp_count;
-	}
-	else
-	{
-		stream.offset = InstData.data[InstanceIndex].back_instr_offset + InstData.data[InstanceIndex].back_rem_pdf_count + InstData.data[InstanceIndex].back_genchoice_count;
-		stream.count = InstData.data[InstanceIndex].back_nprecomp_count;
-	}
-	return stream;
-}
-*/
+#endif

src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -42,10 +42,6 @@ layout (location = 3) out vec2 UV;
 #include <nbl/builtin/glsl/utils/common.glsl>
 #include <nbl/builtin/glsl/utils/transform.glsl>
 
-layout (push_constant) uniform Block {
-    uint instDataOffset;
-} PC;
-
 #ifndef _NBL_VERT_SET1_BINDINGS_DEFINED_
 #define _NBL_VERT_SET1_BINDINGS_DEFINED_
 layout (set = 1, binding = 0, row_major, std140) uniform UBO {
@@ -61,15 +57,14 @@ layout (set = 0, binding = 5, row_major, std430) readonly restrict buffer InstDa
 
 void main()
 {
-	uint instIx = PC.instDataOffset+gl_InstanceIndex;
-	mat4x3 tform = InstData.data[instIx].tform;
+	mat4x3 tform = InstData.data[gl_InstanceIndex].tform;
 	mat4 mvp = nbl_glsl_pseudoMul4x4with4x3(CamData.params.MVP, tform);
 	gl_Position = nbl_glsl_pseudoMul4x4with3x1(mvp, vPosition);
 	WorldPos = nbl_glsl_pseudoMul3x4with3x1(tform, vPosition);
-	mat3 normalMat = mat3(InstData.data[instIx].normalMatrixRow0,InstData.data[instIx].normalMatrixRow1,InstData.data[instIx].normalMatrixRow2);
+	mat3 normalMat = mat3(InstData.data[gl_InstanceIndex].normalMatrixRow0,InstData.data[gl_InstanceIndex].normalMatrixRow1,InstData.data[gl_InstanceIndex].normalMatrixRow2);
 	Normal = transpose(normalMat)*normalize(vNormal);
 	UV = vUV;
-	InstanceIndex = instIx;
+	InstanceIndex = gl_InstanceIndex;
 }
 
 )";
@@ -547,11 +542,6 @@ static core::smart_refctd_ptr<asset::ICPUImage> createBlendWeightImage(const ass
 
 core::smart_refctd_ptr<asset::ICPUPipelineLayout> CMitsubaLoader::createPipelineLayout(asset::IAssetManager* _manager, asset::ICPUVirtualTexture* _vt)
 {
-	SPushConstantRange pcrng;
-	pcrng.offset = 0u;
-	pcrng.size = sizeof(uint32_t);//instance data offset
-	pcrng.stageFlags = static_cast<asset::ISpecializedShader::E_SHADER_STAGE>(asset::ISpecializedShader::ESS_FRAGMENT | asset::ISpecializedShader::ESS_VERTEX);
-
 	core::smart_refctd_ptr<ICPUDescriptorSetLayout> ds0layout; // needs to builtin and cached statically
 	{
 		auto sizes = _vt->getDSlayoutBindings(nullptr, nullptr);
@@ -594,7 +584,7 @@ core::smart_refctd_ptr<asset::ICPUPipelineLayout> CMitsubaLoader::createPipeline
 	}
 	auto ds1layout = getBuiltinAsset<ICPUDescriptorSetLayout, IAsset::ET_DESCRIPTOR_SET_LAYOUT>("nbl/builtin/descriptor_set_layout/basic_view_parameters", _manager);
 
-	return core::make_smart_refctd_ptr<asset::ICPUPipelineLayout>(&pcrng, &pcrng+1, std::move(ds0layout), std::move(ds1layout), nullptr, nullptr);
+	return core::make_smart_refctd_ptr<asset::ICPUPipelineLayout>(nullptr,nullptr, std::move(ds0layout), std::move(ds1layout), nullptr, nullptr);
 }
 
 CMitsubaLoader::CMitsubaLoader(asset::IAssetManager* _manager, io::IFileSystem* _fs) : asset::IAssetLoader(), m_manager(_manager), m_filesystem(_fs)
@@ -1548,7 +1538,7 @@ struct nbl_glsl_ext_Mitsuba_Loader_instance_data_t
 };
 
 
-// Also sets instance data buffer offset into meshbuffers' push constants
+// Also sets instance data buffer offset into meshbuffers' base instance
 template<typename Iter>
 inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS0(const SContext& _ctx, asset::ICPUPipelineLayout* _layout, const asset::material_compiler::CMaterialCompilerGLSLBackendCommon::result_t& _compResult, Iter meshBegin, Iter meshEnd)
 {
@@ -1621,7 +1611,11 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
 		auto* meta = static_cast<const IMeshMetadata*>(mesh->getMetadata());
 
 		core::vectorSIMDf emissive;
-		uint32_t instDataOffset = instanceData.size();
+		for (uint32_t i = 0u; i < mesh->getMeshBufferCount(); ++i)
+		{
+			auto* mb = mesh->getMeshBuffer(i);
+			mb->setBaseInstance(instanceData.size());
+		}
 		for (const auto& inst : meta->getInstances()) {
 			// @Crisspl IIRC lights in mitsuba have "sides" , TODO
 			emissive = inst.emitter.type==CElementEmitter::AREA ? inst.emitter.area.radiance : core::vectorSIMDf(0.f);
@@ -1662,11 +1656,6 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
 
 			instanceData.push_back(instData);
 		}
-		for (uint32_t i = 0u; i < mesh->getMeshBufferCount(); ++i)
-		{
-			auto* mb = mesh->getMeshBuffer(i);
-			reinterpret_cast<uint32_t*>(mb->getPushConstantsDataPtr())[0] = instDataOffset; // use base instance!
-		}
 	}
 #ifdef DEBUG_MITSUBA_LOADER
 	ofile.close();