Merge pull request #43 from Crisspl/spirv-optimizer

Fixes for ex 22

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/Renderer.cpp

@@ -305,18 +305,19 @@ Renderer::InitializationData Renderer::initSceneObjects(const SAssetBundle& mesh
 
 					m_sceneBound.addInternalBox(core::transformBoxEx(aabbOriginal,instance.tform));
 
-					if (instance.emitter.type != ext::MitsubaLoader::CElementEmitter::Type::INVALID)
+					auto emitter = instance.emitter.front;
+					if (emitter.type != ext::MitsubaLoader::CElementEmitter::Type::INVALID)
 					{
-						assert(instance.emitter.type == ext::MitsubaLoader::CElementEmitter::Type::AREA);
+						assert(emitter.type == ext::MitsubaLoader::CElementEmitter::Type::AREA);
 
 						SLight newLight(cpumesh->getBoundingBox(), instance.tform);
 
-						const float weight = newLight.computeFluxBound(instance.emitter.area.radiance) * instance.emitter.area.samplingWeight;
+						const float weight = newLight.computeFluxBound(emitter.area.radiance) * emitter.area.samplingWeight;
 						if (weight <= FLT_MIN)
 							continue;
 
 						retval.lights.emplace_back(std::move(newLight));
-						retval.lightRadiances.push_back(instance.emitter.area.radiance);
+						retval.lightRadiances.push_back(emitter.area.radiance);
 						retval.lightPDF.push_back(weight);
 					}
 				}

include/nbl/ext/MitsubaLoader/CElementEmitter.h

@@ -104,6 +104,7 @@ class CElementEmitter : public IElement
 		CElementEmitter(const char* id) : IElement(id), type(Type::INVALID), /*toWorldType(IElement::Type::TRANSFORM),*/ transform()
 		{
 		}
+		CElementEmitter() : CElementEmitter("") {}
 		CElementEmitter(const CElementEmitter& other) : IElement(""), transform()
 		{
 			operator=(other);

include/nbl/ext/MitsubaLoader/SContext.h

@@ -138,20 +138,24 @@ namespace MitsubaLoader
 
 		struct SInstanceData
 		{
-			SInstanceData(core::matrix3x4SIMD _tform, SContext::bsdf_type _bsdf, const std::string& _id, const CElementEmitter& _emitter) : 
+			SInstanceData(core::matrix3x4SIMD _tform, SContext::bsdf_type _bsdf, const std::string& _id, const CElementEmitter& _emitterFront, const CElementEmitter& _emitterBack) :
 				tform(_tform), bsdf(_bsdf),
 #if defined(_NBL_DEBUG) || defined(_NBL_RELWITHDEBINFO)
 				bsdf_id(_id),
 #endif
-				emitter(_emitter)
+				emitter{_emitterFront, _emitterBack}
 			{}
 
 			core::matrix3x4SIMD tform;
 			SContext::bsdf_type bsdf;
 #if defined(_NBL_DEBUG) || defined(_NBL_RELWITHDEBINFO)
 			std::string bsdf_id;
 #endif
-			CElementEmitter emitter; // type is invalid if not used
+			struct {
+				// type is invalid if not used
+				CElementEmitter front;
+				CElementEmitter back;
+			} emitter;
 		};
 		core::unordered_multimap<const shape_ass_type::pointee*, SInstanceData> mapMesh2instanceData;
 

src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -865,7 +865,7 @@ SContext::shape_ass_type CMitsubaLoader::loadBasicShape(SContext& ctx, uint32_t
 		assert(shape->bsdf);
 		auto bsdf = getBSDFtreeTraversal(ctx, shape->bsdf);
 		core::matrix3x4SIMD tform = core::concatenateBFollowedByA(relTform, shape->getAbsoluteTransform());
-		SContext::SInstanceData instance(tform, bsdf, shape->bsdf->id, shape->obtainEmitter());
+		SContext::SInstanceData instance(tform, bsdf, shape->bsdf->id, shape->obtainEmitter(), CElementEmitter{});
 		ctx.mapMesh2instanceData.insert({ mesh.get(), instance });
 	};
 
@@ -1616,8 +1616,10 @@ inline core::smart_refctd_ptr<asset::ICPUDescriptorSet> CMitsubaLoader::createDS
 			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);
+			// @Crisspl IIRC lights in mitsuba have "sides"
+			//
+			// i think it's just that backside of an area emitter does not emit, docs doesnt say anything about this
+			emissive = inst.emitter.front.type==CElementEmitter::AREA ? inst.emitter.front.area.radiance : core::vectorSIMDf(0.f);
 
 			nbl_glsl_ext_Mitsuba_Loader_instance_data_t instData;
 

src/nbl/ext/RadeonRays/RadeonRays.cpp

@@ -125,8 +125,11 @@ void Manager::makeInstance(	NblInstanceRRInstanceCache& instanceCache, MockScene
 					continue;
 				::RadeonRays::Shape* shape = cpuAssociation.second;
 				auto successAndLocation = gpuCache.emplace(gpumeshbuffer,shape);
-				if (gpumeshbuffer==mb)
+				if (gpumeshbuffer == mb)
+				{
 					found = successAndLocation.first;
+					break;
+				}
 			}
 			notRefreshedAlready = false;
 		}