Merge branch 'shader_pipeline' into BallotBitCountTest

Author: Hazardu

3rdparty/CMakeLists.txt

@@ -34,6 +34,7 @@ update_git_submodule(./openssl)
 update_git_submodule(./libjpeg-turbo)
 update_git_submodule(./libjpeg) # soon to be killed
 update_git_submodule(./parallel-hashmap)
+update_git_submodule(./gli)
 # exceptions that get automatically cloned
 update_git_submodule(./glm)
 update_git_submodule(./freetype2)
@@ -454,6 +455,9 @@ if (IRR_COMPILE_WITH_CUDA)
 endif()
 
 set(IRR_3RDPARTY_TARGETS
+				RadeonRays
+				CLW
+				Calc
 				lzma
 				lz4
 				aesGladman
@@ -507,4 +511,4 @@ install(
 	DIRECTORY ./parallel-hashmap/parallel_hashmap 
 	DESTINATION ./relwithdebinfo/include/parallel-hashmap
 	CONFIGURATIONS RelWithDebInfo
-)
+)

examples_tests/18.MitsubaLoader/main.cpp

@@ -35,11 +35,11 @@ layout(set = 2, binding = 1) uniform sampler2D envMap;
 layout(set = 2, binding = 2) uniform usamplerBuffer sampleSequence;
 layout(set = 2, binding = 3) uniform usampler2D scramblebuf;
 
-vec2 rand2d(in uint _sample, inout irr_glsl_xoroshiro64star_state_t scramble_state)
+vec3 rand3d(in uint _sample, inout irr_glsl_xoroshiro64star_state_t scramble_state)
 {
-	uvec2 seqVal = texelFetch(sampleSequence,int(_sample)).xy;
-	seqVal ^= uvec2(irr_glsl_xoroshiro64star(scramble_state),irr_glsl_xoroshiro64star(scramble_state));
-    return vec2(seqVal)*uintBitsToFloat(0x2f800004u);
+	uvec3 seqVal = texelFetch(sampleSequence,int(_sample)).xyz;
+	seqVal ^= uvec3(irr_glsl_xoroshiro64star(scramble_state),irr_glsl_xoroshiro64star(scramble_state),irr_glsl_xoroshiro64star(scramble_state));
+    return vec3(seqVal)*uintBitsToFloat(0x2f800004u);
 }
 
 vec2 SampleSphericalMap(in vec3 v)
@@ -50,7 +50,7 @@ vec2 SampleSphericalMap(in vec3 v)
     return uv;
 }
 
-vec3 irr_computeLighting(inout irr_glsl_IsotropicViewSurfaceInteraction out_interaction, in mat2 dUV)
+vec3 irr_computeLighting(inout irr_glsl_IsotropicViewSurfaceInteraction out_interaction, in mat2 dUV, in MC_precomputed_t precomp)
 {
 	irr_glsl_xoroshiro64star_state_t scramble_start_state = textureLod(scramblebuf,gl_FragCoord.xy/VIEWPORT_SZ,0).rg;
 
@@ -59,32 +59,30 @@ vec3 irr_computeLighting(inout irr_glsl_IsotropicViewSurfaceInteraction out_inte
 	vec3 color = vec3(0.0);
 
 #ifdef USE_ENVMAP
-	instr_stream_t gcs = getGenChoiceStream();
+	instr_stream_t gcs = getGenChoiceStream(precomp);
+	instr_stream_t rnps = getRemAndPdfStream(precomp);
 	for (int i = 0; i < SAMPLE_COUNT; ++i)
 	{
 		irr_glsl_xoroshiro64star_state_t scramble_state = scramble_start_state;
 
-		instr_stream_t gcs = getGenChoiceStream();
-		instr_stream_t rnps = getRemAndPdfStream();
-
-		vec2 rand = rand2d(i,scramble_state);//TODO has to be 3d
+		vec3 rand = rand3d(i,scramble_state);
 		float pdf;
-		runGenerateAndRemainderStream(gcs, rnps, rand, pdf);
+		irr_glsl_LightSample s;
+		vec3 rem = runGenerateAndRemainderStream(precomp, gcs, rnps, rand, pdf, s);
 
-		vec2 uv = SampleSphericalMap(L);
+		vec2 uv = SampleSphericalMap(s.L);
 		color += rem*textureLod(envMap, uv, 0.0).xyz;
 	}
 	color /= float(SAMPLE_COUNT);
 #endif
 
-	irr_glsl_BSDFIsotropicParams params;
 	for (int i = 0; i < LIGHT_COUNT; ++i)
 	{
 		SLight l = lights[i];
 		vec3 L = l.position-WorldPos;
-		params.L = L;
+		//params.L = L;
 		const float intensityScale = LIGHT_INTENSITY_SCALE;//ehh might want to render to hdr fbo and do tonemapping
-		color += irr_bsdf_cos_eval(params, out_interaction, dUV)*l.intensity*intensityScale / dot(L,L);
+		color += irr_bsdf_cos_eval(precomp, normalize(L), out_interaction, dUV)*l.intensity*intensityScale / dot(L,L);
 	}
 
 	return color+emissive;
@@ -344,7 +342,7 @@ int main()
 		meshmetas.push_back(static_cast<const ext::MitsubaLoader::IMeshMetadata*>(cpumesh->getMetadata()));
 		const auto& instances = meshmetas.back()->getInstances();
 
-		auto computeAreaAndAvgPos = [](asset::ICPUMeshBuffer* mb, const core::matrix3x4SIMD& tform, core::vectorSIMDf& _outAvgPos) {
+		auto computeAreaAndAvgPos = [](const asset::ICPUMeshBuffer* mb, const core::matrix3x4SIMD& tform, core::vectorSIMDf& _outAvgPos) {
 			uint32_t triCount = 0u;
 			asset::IMeshManipulator::getPolyCount(triCount, mb);
 			assert(triCount>0u);
@@ -392,7 +390,7 @@ int main()
 		}
 	}
 
-	constexpr uint32_t ENVMAP_SAMPLE_COUNT = 64u;
+	constexpr uint32_t ENVMAP_SAMPLE_COUNT = 16u;
 	constexpr float LIGHT_INTENSITY_SCALE = 0.01f;
 
 	core::unordered_set<const asset::ICPURenderpassIndependentPipeline*> modifiedPipelines;
@@ -440,18 +438,8 @@ int main()
 		}
 	}
 
-	auto gpuVT = core::make_smart_refctd_ptr<video::IGPUVirtualTexture>(driver, globalMeta->VT.get());
+	//auto gpuVT = core::make_smart_refctd_ptr<video::IGPUVirtualTexture>(driver, globalMeta->VT.get());
 	auto gpuds0 = driver->getGPUObjectsFromAssets(&cpuds0.get(), &cpuds0.get()+1)->front();
-	{
-		auto count = gpuVT->getDescriptorSetWrites(nullptr, nullptr, nullptr);
-
-		auto writes = core::make_refctd_dynamic_array<core::smart_refctd_dynamic_array<video::IGPUDescriptorSet::SWriteDescriptorSet>>(count.first);
-		auto info = core::make_refctd_dynamic_array<core::smart_refctd_dynamic_array<video::IGPUDescriptorSet::SDescriptorInfo>>(count.second);
-
-		gpuVT->getDescriptorSetWrites(writes->data(), info->data(), gpuds0.get());
-
-		driver->updateDescriptorSets(writes->size(), writes->data(), 0u, nullptr);
-	}
 
     auto gpuds1layout = driver->getGPUObjectsFromAssets(&ds1layout, &ds1layout+1)->front();
 
@@ -477,18 +465,20 @@ int main()
 	smart_refctd_ptr<video::IGPUBufferView> gpuSequenceBufferView;
 	{
 		constexpr uint32_t MaxSamples = ENVMAP_SAMPLE_COUNT;
+		constexpr uint32_t Channels = 3u;
 
-		auto sampleSequence = core::make_smart_refctd_ptr<asset::ICPUBuffer>(sizeof(uint32_t) * MaxSamples*2u);
+		auto sampleSequence = core::make_smart_refctd_ptr<asset::ICPUBuffer>(sizeof(uint32_t) * MaxSamples*Channels);
 
-		core::OwenSampler sampler(1u, 0xdeadbeefu);
+		core::OwenSampler sampler(Channels, 0xdeadbeefu);
 
 		auto out = reinterpret_cast<uint32_t*>(sampleSequence->getPointer());
-		for (uint32_t i = 0; i < MaxSamples*2u; i++)
+		for (uint32_t c = 0; c < Channels; ++c)
+		for (uint32_t i = 0; i < MaxSamples; i++)
 		{
-			out[i] = sampler.sample(i&1u, i>>1);
+			out[Channels*i + c] = sampler.sample(c, i);
 		}
 		auto gpuSequenceBuffer = driver->createFilledDeviceLocalGPUBufferOnDedMem(sampleSequence->getSize(), sampleSequence->getPointer());
-		gpuSequenceBufferView = driver->createGPUBufferView(gpuSequenceBuffer.get(), asset::EF_R32G32_UINT);
+		gpuSequenceBufferView = driver->createGPUBufferView(gpuSequenceBuffer.get(), asset::EF_R32G32B32_UINT);
 	}
 
 	smart_refctd_ptr<video::IGPUImageView> gpuScrambleImageView;