begin the final march towards raygen and throughput

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/raygen.comp

@@ -24,7 +24,7 @@ vec3 nbl_glsl_MC_getNormalizedWorldSpaceV()
 {
 	return normalizedV;
 }
-vec3 normalizedN; // TODO
+vec3 normalizedN;
 vec3 nbl_glsl_MC_getNormalizedWorldSpaceN()
 {
 	return normalizedN;
@@ -94,8 +94,8 @@ struct SamplingData_t
 bool gen_sample_ray(out float maxT, out vec3 direction, out vec3 throughput, in SamplingData_t samplingData)
 {
 	maxT = FLT_MAX;
-	direction = -nbl_glsl_MC_getNormalizedWorldSpaceV();
-	throughput = vec3(1.0);
+	direction = nbl_glsl_MC_getNormalizedWorldSpaceN();
+	throughput = vec3(1.0)/float(staticViewData.samplesPerPixelPerDispatch);
 	return true;
 }
 
@@ -201,12 +201,10 @@ void main()
 			const uint realOutputID = outputID+i;
 			if (validRay)
 			{
-				throughput.rgb /= float(staticViewData.samplesPerPixelPerDispatch);
-
-				const float tt = 1.0/1024.0;
-				rays[realOutputID].origin = worldPosition+nbl_glsl_MC_getNormalizedWorldSpaceV()*tt;//-direction*0.5*maxT;/*+newray.direction*err?; TODO */
-				rays[realOutputID].maxT = tt*2.0;
-				rays[realOutputID].direction = -nbl_glsl_MC_getNormalizedWorldSpaceV();
+				const float err = 1.0/512.0;
+				rays[realOutputID].origin = worldPosition+direction*err;
+				rays[realOutputID].maxT = max(maxT-err,0.0);
+				rays[realOutputID].direction = direction;
 				rays[realOutputID].mask = -1;
 				rays[realOutputID]._active = 1;
 				rays[realOutputID].backfaceCulling = int(packHalf2x16(throughput.ab));

examples_tests/22.RaytracedAO/resolve.comp

@@ -1,6 +1,7 @@
 #version 430 core
 #include "raytraceCommon.glsl"
 
+#include <nbl/builtin/glsl/ext/MitsubaLoader/instance_data_descriptor.glsl>
 
 #include <nbl/builtin/glsl/ext/RadeonRays/intersection.glsl>
 layout(set = 2, binding = 0, std430) restrict buffer Queries
@@ -20,7 +21,7 @@ void main()
 
 		vec3 color = vec3(0.0);
 		uvec2 groupLocation = gl_WorkGroupID.xy*gl_WorkGroupSize.xy;
-		for (uint i=0u; i<1u/*staticViewData.samplesPerPixelPerDispatch*/; i++)
+		for (uint i=0u; i<staticViewData.samplesPerPixelPerDispatch; i++)
 		{
 			const uint rayID = baseID+i;
 			nbl_glsl_ext_RadeonRays_Intersection hit = hits[rayID];
@@ -29,8 +30,12 @@ void main()
 			if (hit.shapeid<0)
 				continue;
 
-			color.r -= float(hit.shapeid);//staticViewData.samplesPerPixelPerDispatch;
-			color.g -= float(hit.primid);//staticViewData.samplesPerPixelPerDispatch;
+			// TODO: fetch from ray buffer
+			const float thoughput = 1.0/7.0;
+				
+			const bool frontface = true; // TODO: how to determine frontface easily from radeon rays!? barycentrics? ray direction vs. oriented cross product?
+			nbl_glsl_MC_oriented_material_t material = nbl_glsl_MC_material_data_t_getOriented(InstData.data[hit.shapeid].material,frontface);
+			color += nbl_glsl_MC_oriented_material_t_getEmissive(material)*thoughput;
 
 			// hit buffer needs clearing
 			hits[rayID].shapeid = -1;
@@ -40,8 +45,6 @@ void main()
 		else
 			acc += color;
 		storeAccumulation(acc,pixelCoord);
-		acc = abs(color);
-        acc.rg /= vec2(32.0,1023.0);
 		imageStore(framebuffer,pixelCoord,uvec4(nbl_glsl_encodeRGB10A2(vec4(acc,1.0)),0u,0u,0u));
 	}
 }