allow for environment lights (constant for now, IBL later)

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/raygen.comp

@@ -85,7 +85,7 @@ vec3 rand3d(inout nbl_glsl_xoroshiro64star_state_t scramble_state, in uint _samp
     return vec3(seqVal)*uintBitsToFloat(0x2f800004u);
 }
 
-bool gen_sample_ray(
+void gen_sample_ray(
 	out float maxT, out vec3 direction, out vec3 throughput,
 	inout nbl_glsl_xoroshiro64star_state_t scramble_state, in uint sampleID,
 	in nbl_glsl_MC_precomputed_t precomp, in nbl_glsl_MC_instr_stream_t gcs, in nbl_glsl_MC_instr_stream_t rnps
@@ -101,8 +101,6 @@ bool gen_sample_ray(
 	throughput /= float(staticViewData.samplesPerPixelPerDispatch);
 
 	direction = s.L;
-
-	return any(greaterThan(throughput,vec3(FLT_MIN)));
 }
 
 void main()
@@ -122,6 +120,7 @@ void main()
 		nbl_glsl_MC_precomputed_t precomputed;
 
 		const bool nonBackgroudPixel = revdepth>0.0;
+		vec3 emissive = staticViewData.envmapBaseColor;
 		if (nonBackgroudPixel)
 		{			
 			// vis buffer read
@@ -154,7 +153,6 @@ void main()
 			}
 
 			// decode vis buffer
-			vec3 emissive = vec3(0.0,0.0,0.0);
 			{
 				const uint objectID = visBuffer[0]&0x7fffffffu;
 				const uint triangleID = visBuffer[1];
@@ -184,18 +182,18 @@ void main()
 					nbl_glsl_MC_runNormalPrecompStream(nbl_glsl_MC_oriented_material_t_getNormalPrecompStream(material), dUVdScreen, precomputed);
 				#endif
 			}
+		}
 
-			//
-			if (any(greaterThan(emissive,vec3(FLT_MIN))))
+		//
+		if (any(greaterThan(emissive,vec3(FLT_MIN))))
+		{
+			vec3 acc = emissive;
+			if (pc.cummon.rcpFramesDispatched<1.0)
 			{
-				vec3 acc = emissive;
-				if (pc.cummon.rcpFramesDispatched<1.0)
-				{
-					acc /= float(pc.cummon.framesDispatched-1u);
-					acc += fetchAccumulation(pixelCoord);
-				}
-				storeAccumulation(acc,pixelCoord);
+				acc /= float(pc.cummon.framesDispatched-1u);
+				acc += fetchAccumulation(pixelCoord);
 			}
+			storeAccumulation(acc,pixelCoord);
 		}
 #ifdef USE_OPTIX_DENOISER
 		// TODO: translate normal into float16_t buff
@@ -205,19 +203,18 @@ void main()
 		{
 			vec3 direction;
 			float maxT;
-			vec4 throughput;
-			throughput.a = -1.0; // -1 needs to be there to ensure no backface culling on rays
+			vec4 throughput = vec4(0.0,0.0,0.0,-1.0); // -1 needs to be there to ensure no backface culling on rays
 
-			bool validRay = false;
 			if (nonBackgroudPixel)
 			{
 				nbl_glsl_xoroshiro64star_state_t scramble_state = scramble_start_state;
 				const uint sampleID = pc.cummon.samplesComputedPerPixel+i;
-				validRay = gen_sample_ray(maxT,direction,throughput.rgb,scramble_state,sampleID,precomputed,gcs,rnps);
+				gen_sample_ray(maxT,direction,throughput.rgb,scramble_state,sampleID,precomputed,gcs,rnps);
 			}
 
 			// TODO: repack rays in smem for coalescing, or optimize this somehow
 			const uint realOutputID = outputID+i;
+			const bool validRay = any(greaterThan(throughput.rgb,vec3(FLT_MIN)));
 			if (validRay)
 			{
 				const float err = 1.0/256.0; // TODO: improve ray offsets
@@ -226,15 +223,15 @@ void main()
 				rays[realOutputID].direction = direction;
 				rays[realOutputID].mask = -1;
 				rays[realOutputID]._active = 1;
-				rays[realOutputID].backfaceCulling = int(packHalf2x16(throughput.ab));
-				rays[realOutputID].useless_padding = int(packHalf2x16(throughput.gr));
 			}
 			else
 			{
 				rays[realOutputID].maxT = 0.0;
 				rays[realOutputID].mask = 0;
 				rays[realOutputID]._active = 0;
 			}
+			rays[realOutputID].backfaceCulling = int(packHalf2x16(throughput.ab));
+			rays[realOutputID].useless_padding = int(packHalf2x16(throughput.gr));
 		}
 	}
 }

examples_tests/22.RaytracedAO/resolve.comp

@@ -26,18 +26,21 @@ void main()
 			const uint rayID = baseID+i;
 			nbl_glsl_ext_RadeonRays_Intersection hit = hits[rayID];
 
-			// actually got a hit
-			if (hit.shapeid<0)
-				continue;
-
 			const vec3 thoughput = vec3(unpackHalf2x16(rays[rayID].useless_padding).yx,unpackHalf2x16(rays[rayID].backfaceCulling).yx);
-				
-			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;
+			// init to miss color
+			vec3 emissive = staticViewData.envmapBaseColor;
+			// actually got a hit	
+			if (hit.shapeid>=0)
+			{
+				const bool frontface = true; // TODO: how to determine frontface easily from radeon rays!? barycentrics? ray direction vs. oriented cross product?
+
+				// hit buffer needs clearing
+				hits[rayID].shapeid = -1;
 
-			// hit buffer needs clearing
-			hits[rayID].shapeid = -1;
+				nbl_glsl_MC_oriented_material_t material = nbl_glsl_MC_material_data_t_getOriented(InstData.data[hit.shapeid].material,frontface);
+				emissive = nbl_glsl_MC_oriented_material_t_getEmissive(material);
+			}
+			color += emissive*thoughput;
 		}
 		if (pc.cummon.rcpFramesDispatched<1.0)
 			acc += (color-acc)*pc.cummon.rcpFramesDispatched;