One final fix in the MitsubaLoader

Also remove the nasty ieee754 error tracking code from the shaders

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/closestHit.comp

@@ -68,8 +68,7 @@ void main()
 			const uvec3 indices = get_triangle_indices(batchInstanceData,triangleID);
 
 			// positions
-			mat2x3 dPdBary_error; vec3 lastVxPos_error;
-			const vec3 lastVxPos = load_positions(dPdBary_error,lastVxPos_error,indices,batchInstanceData);
+			const vec3 lastVxPos = load_positions(indices,batchInstanceData);
 			const vec3 geomNormal = cross(dPdBary[0],dPdBary[1]);
 			const bool frontfacing = bool((batchInstanceData.determinantSignBit^floatBitsToUint(dot(geomNormal,normalizedV)))&0x80000000u);
 
@@ -89,13 +88,11 @@ void main()
 #endif
 				);
 
-				vec3 origin_error;
-				const float compactBary_error = nbl_glsl_ieee754_gamma(1u);
-				const vec3 origin = nbl_glsl_interpolate_with_bounds(origin_error,dPdBary,dPdBary_error,lastVxPos,lastVxPos_error,compactBary,compactBary_error);
-				
+				const vec3 origin = dPdBary*compactBary+lastVxPos;
+
 				generate_next_rays(
 					MAX_RAYS_GENERATED,material,frontfacing,vertex_depth,scramble_start_state,
-					sampleID,outPixelLocation,origin,origin_error,throughput
+					sampleID,outPixelLocation,origin,throughput
 				);
 			}
 		}

examples_tests/22.RaytracedAO/raygen.comp

@@ -54,24 +54,21 @@ void main()
 
 			const uint vertex_depth_mod_2 = 0x1u;
 			// load vertex data
-			mat2x3 dPdBary_error; vec3 lastVxPos_error;
-			const vec3 lastVxPos = load_positions(dPdBary_error,lastVxPos_error,indices,batchInstanceData);
+			const vec3 lastVxPos = load_positions(indices,batchInstanceData);
 			const nbl_glsl_xoroshiro64star_state_t scramble_start_state = load_aux_vertex_attrs(compactBary,indices,batchInstanceData,material,outPixelLocation,vertex_depth_mod_2
 #ifdef TEX_PREFETCH_STREAM
 				,dBarydScreen
 #endif
 			);
 
-			vec3 origin_error;
-			const float compactBary_error = exp2(-16.f); // UNORM16 being used for storage
-			const vec3 origin = nbl_glsl_interpolate_with_bounds(origin_error,dPdBary,dPdBary_error,lastVxPos,lastVxPos_error,compactBary,compactBary_error);
+			const vec3 origin = dPdBary*compactBary+lastVxPos;
 			normalizedV = normalize(pc.cummon.camPos-origin);
 
 			// generate rays
 			const uint vertex_depth = 1u;
 			generate_next_rays(
 				staticViewData.samplesPerPixelPerDispatch,material,frontfacing,vertex_depth,
-				scramble_start_state,pc.cummon.samplesComputed,outPixelLocation,origin,origin_error,vec3(1.0)
+				scramble_start_state,pc.cummon.samplesComputed,outPixelLocation,origin,vec3(1.0)
 			);
 		}
 

examples_tests/22.RaytracedAO/raytraceCommon.glsl

@@ -116,28 +116,19 @@ vec3 nbl_glsl_MC_getNormalizedWorldSpaceN()
 
 #include <nbl/builtin/glsl/barycentric/utils.glsl>
 mat2x3 dPdBary;
-vec3 load_positions(out mat2x3 dPdBary_error, out vec3 lastVxPos_error,in uvec3 indices, in nbl_glsl_ext_Mitsuba_Loader_instance_data_t batchInstanceData)
+vec3 load_positions(in uvec3 indices, in nbl_glsl_ext_Mitsuba_Loader_instance_data_t batchInstanceData)
 {
 	mat3 positions = mat3(
 		nbl_glsl_fetchVtxPos(indices[0],batchInstanceData),
 		nbl_glsl_fetchVtxPos(indices[1],batchInstanceData),
 		nbl_glsl_fetchVtxPos(indices[2],batchInstanceData)
 	);
 	const mat4x3 tform = batchInstanceData.tform;
-	mat3 positions_error;
-	// when we quantize positions to RGB21_UNORM, change to exp2(-22.f)
-	const float quantizationError = nbl_glsl_numeric_limits_float_epsilon(1u);
-	positions = nbl_glsl_mul_with_bounds_wo_gamma(positions_error,mat3(tform),positions,quantizationError);
-	positions_error *= nbl_glsl_ieee754_gamma(2u);
+	positions = mat3(tform)*positions;
 	//
 	for (int i=0; i<2; i++)
-	{
-		dPdBary[i] = nbl_glsl_ieee754_sub_with_bounds_wo_gamma(dPdBary_error[i],positions[i],positions_error[i],positions[2],positions_error[2]);
-		dPdBary_error[i] *= nbl_glsl_ieee754_gamma(1u);
-	}
-	const vec3 lastVx = nbl_glsl_ieee754_add_with_bounds_wo_gamma(lastVxPos_error,positions[2],positions_error[2],tform[3],vec3(0.f));
-	lastVxPos_error *= nbl_glsl_ieee754_gamma(1u);
-	return lastVx;
+		dPdBary[i] = positions[i]-positions[2];
+	return positions[2]+tform[3];
 }
 
 #ifdef TEX_PREFETCH_STREAM
@@ -200,25 +191,6 @@ nbl_glsl_xoroshiro64star_state_t load_aux_vertex_attrs(
 	return scramble_start_state;
 }
 
-// TODO MOVE to some other header!
-vec3 nbl_glsl_interpolate_with_bounds(out vec3 error, in mat2x3 triangleEdges, in mat2x3 triangleEdges_error,
-	in vec3 origin, in vec3 origin_error, in vec2 compactBary, in float compactBary_error
-)
-{
-	vec3 error1;
-	const vec3 col1 = nbl_glsl_ieee754_mul_with_bounds_wo_gamma(error1,triangleEdges[0],triangleEdges_error[0],compactBary.x,compactBary_error);
-	error1 *= nbl_glsl_ieee754_gamma(1u);
-	vec3 error2;
-	const vec3 col2 = nbl_glsl_ieee754_mul_with_bounds_wo_gamma(error2,triangleEdges[1],triangleEdges_error[1],compactBary.y,compactBary_error);
-	error2 *= nbl_glsl_ieee754_gamma(1u);
-	vec3 error3;
-	vec3 retval = nbl_glsl_ieee754_add_with_bounds_wo_gamma(error3,col1,error1,col2,error2);
-	error3 *= nbl_glsl_ieee754_gamma(1u);
-	retval = nbl_glsl_ieee754_add_with_bounds_wo_gamma(error,retval,error3,origin,origin_error);
-	//error *= nbl_glsl_ieee754_gamma(1u);
-	error *= nbl_glsl_ieee754_gamma(8u); // cause PBRT says so
-	return retval;
-}
 // robust ray origins
 vec3 nbl_glsl_robust_ray_origin_impl(in vec3 origin, in vec3 direction, float offset, vec3 normal)
 {
@@ -256,7 +228,7 @@ void gen_sample_ray(
 void generate_next_rays(
 	in uint maxRaysToGen, in nbl_glsl_MC_oriented_material_t material, in bool frontfacing, in uint vertex_depth,
 	in nbl_glsl_xoroshiro64star_state_t scramble_start_state, in uint sampleID, in uvec2 outPixelLocation,
-	in vec3 origin, vec3 origin_error, in vec3 prevThroughput)
+	in vec3 origin, in vec3 prevThroughput)
 {
 	// get material streams as well
 	const nbl_glsl_MC_instr_stream_t gcs = nbl_glsl_MC_oriented_material_t_getGenChoiceStream(material);

src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -781,13 +781,16 @@ SContext::shape_ass_type CMitsubaLoader::loadBasicShape(SContext& ctx, uint32_t
 				for (auto& meshbuffer : mesh->getMeshBufferVector())
 				{
 					auto binding = meshbuffer->getVertexBufferBindings()[UV_ATTRIB_ID];
-					binding.buffer = core::smart_refctd_ptr_static_cast<ICPUBuffer>(binding.buffer->clone(0u));
-					meshbuffer->setVertexBufferBinding(std::move(binding),UV_ATTRIB_ID);
-					core::vectorSIMDf uv;
-					for (uint32_t i=0u; meshbuffer->getAttribute(uv,UV_ATTRIB_ID,i); i++)
+					if (binding.buffer)
 					{
-						uv.y = -uv.y;
-						meshbuffer->setAttribute(uv,UV_ATTRIB_ID,i);
+						binding.buffer = core::smart_refctd_ptr_static_cast<ICPUBuffer>(binding.buffer->clone(0u));
+						meshbuffer->setVertexBufferBinding(std::move(binding),UV_ATTRIB_ID);
+						core::vectorSIMDf uv;
+						for (uint32_t i=0u; meshbuffer->getAttribute(uv,UV_ATTRIB_ID,i); i++)
+						{
+							uv.y = -uv.y;
+							meshbuffer->setAttribute(uv,UV_ATTRIB_ID,i);
+						}
 					}
 				}
 			}
@@ -807,27 +810,31 @@ SContext::shape_ass_type CMitsubaLoader::loadBasicShape(SContext& ctx, uint32_t
 				if (totalVertexCount)
 				{
 					constexpr uint32_t hidefRGBSize = 4u;
-					auto newRGB = core::make_smart_refctd_ptr<asset::ICPUBuffer>(hidefRGBSize*totalVertexCount);
-					uint32_t* it = reinterpret_cast<uint32_t*>(newRGB->getPointer());
+					auto newRGBbuff = core::make_smart_refctd_ptr<asset::ICPUBuffer>(hidefRGBSize*totalVertexCount);
 					newMesh = core::smart_refctd_ptr_static_cast<asset::ICPUMesh>(mesh->clone(1u));
+					constexpr uint32_t COLOR_ATTR = 1u;
+					constexpr uint32_t COLOR_BUF_BINDING = 15u;
+					uint32_t* newRGB = reinterpret_cast<uint32_t*>(newRGBbuff->getPointer());
+					uint32_t offset = 0u;
 					for (auto& meshbuffer : mesh->getMeshBufferVector())
 					{
 						core::vectorSIMDf rgb;
-						for (uint32_t i=0u; meshbuffer->getAttribute(rgb,1u,i); i++,it++)
+						for (uint32_t i=0u; meshbuffer->getAttribute(rgb,COLOR_ATTR,i); i++,offset++)
 						{
 							for (auto i=0; i<3u; i++)
 								rgb[i] = core::srgb2lin(rgb[i]);
-							meshbuffer->setAttribute(rgb,it,asset::EF_A2B10G10R10_UNORM_PACK32);
+							ICPUMeshBuffer::setAttribute(rgb,newRGB+offset,asset::EF_A2B10G10R10_UNORM_PACK32);
 						}
-						constexpr uint32_t COLOR_BUF_BINDING = 15u;
-						auto& vtxParams = meshbuffer->getPipeline()->getVertexInputParams();
-						vtxParams.attributes[1].format = EF_A2B10G10R10_UNORM_PACK32;
-						vtxParams.attributes[1].relativeOffset = 0u;
-						vtxParams.attributes[1].binding = COLOR_BUF_BINDING;
+						auto newPipeline = core::smart_refctd_ptr_static_cast<ICPURenderpassIndependentPipeline>(meshbuffer->getPipeline()->clone(0u));
+						auto& vtxParams = newPipeline->getVertexInputParams();
+						vtxParams.attributes[COLOR_ATTR].format = EF_A2B10G10R10_UNORM_PACK32;
+						vtxParams.attributes[COLOR_ATTR].relativeOffset = 0u;
+						vtxParams.attributes[COLOR_ATTR].binding = COLOR_BUF_BINDING;
 						vtxParams.bindings[COLOR_BUF_BINDING].inputRate = EVIR_PER_VERTEX;
 						vtxParams.bindings[COLOR_BUF_BINDING].stride = hidefRGBSize;
 						vtxParams.enabledBindingFlags |= (1u<<COLOR_BUF_BINDING);
-						meshbuffer->setVertexBufferBinding({0ull,core::smart_refctd_ptr(newRGB)}, COLOR_BUF_BINDING);
+						meshbuffer->setPipeline(std::move(newPipeline));
+						meshbuffer->setVertexBufferBinding({offset*hidefRGBSize,core::smart_refctd_ptr(newRGBbuff)},COLOR_BUF_BINDING);
 					}
 				}
 			}