Merge remote-tracking branch 'origin/shader_pipeline_irrlichtbaw'

# Conflicts:
#	examples_tests/22.RaytracedAO/raygen.comp
#	examples_tests/22.RaytracedAO/raytraceCommon.glsl

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/dirty_source/ExtraCrap.cpp

@@ -816,7 +816,13 @@ void Renderer::init(const SAssetBundle& meshes,
 				auto resolveInfos = infos+descriptorExclScanSum[2];
 				auto resolveWrites = writes+descriptorExclScanSum[2];
 				createEmptyInteropBufferAndSetUpInfo(resolveInfos+0,m_intersectionBuffer,intersectionBufferSize);
-				setImageInfo(resolveInfos+1,asset::EIL_GENERAL,core::smart_refctd_ptr(m_tonemapOutput));
+				core::smart_refctd_ptr<IGPUImageView> tonemapOutputStorageView;
+				{
+					IGPUImageView::SCreationParams viewparams = m_tonemapOutput->getCreationParameters();
+					viewparams.format = EF_R32_UINT;
+					tonemapOutputStorageView = m_driver->createGPUImageView(std::move(viewparams));
+				}
+				setImageInfo(resolveInfos+1,asset::EIL_GENERAL,std::move(tonemapOutputStorageView));
 
 
 				setDstSetAndDescTypesOnWrites(m_resolveDS.get(),resolveWrites,resolveInfos,{EDT_STORAGE_BUFFER,EDT_STORAGE_IMAGE});

examples_tests/22.RaytracedAO/raygen.comp

@@ -1,6 +1,7 @@
 #version 430 core
 #include "raytraceCommon.glsl"
 
+// for per pixel inputs
 #include <nbl/builtin/glsl/utils/normal_decode.glsl>
 #include <nbl/builtin/glsl/random/xoroshiro.glsl>
 
@@ -352,7 +353,7 @@ void main()
 				throughput /= float(staticViewData.samplesPerPixelPerDispatch);
 
 				rays[realOutputID].origin = nbl_glsl_MC_WorldSpacePosition();/*+newray.direction*err?; TODO */
-				rays[realOutputID].maxT = 0.0;
+				rays[realOutputID].maxT = FLT_MAX;
 				rays[realOutputID].direction = direction;
 				rays[realOutputID].mask = -1;
 				rays[realOutputID]._active = 1;

examples_tests/22.RaytracedAO/raytraceCommon.glsl

@@ -137,12 +137,15 @@ layout(set = 1, binding = 5, std430, row_major) restrict readonly buffer LightRa
 vec3 fetchAccumulation(in ivec2 coord)
 {
     const uvec2 data = imageLoad(accumulation,coord).rg;
-    return nbl_glsl_decodeRGB19E7(data);
-}
+	// for now until @Crisspl fixes rgb19e7 encode/decode
+    //return irr_glsl_decodeRGB19E7(data);
+	return vec3(unpackHalf2x16(data[0]),unpackHalf2x16(data[1])[0]);}
 void storeAccumulation(in vec3 color, in ivec2 coord)
 {
-	imageStore(accumulation,coord,uvec4(nbl_glsl_encodeRGB19E7(color),0u,0u));
-}
+	// for now until @Crisspl fixes rgb19e7 encode/decode
+	//const uvec2 data = irr_glsl_encodeRGB19E7(color);
+	const uvec2 data = uvec2(packHalf2x16(color.rg),packHalf2x16(vec2(color.b,1.0)));
+	imageStore(accumulation,coord,uvec4(data,0u,0u));}
 #endif