resolved problems post merge

Author: Hazardu

examples_tests/22.RaytracedAO/bin/screenshot.png

@@ -19,8 +19,8 @@
 	{
 		float x,y,z;
 	};
-	#define mat4 irr::core::matrix4SIMD
-	#define mat4x3 irr::core::matrix3x4SIMD
+	#define mat4 nbl::core::matrix4SIMD
+	#define mat4x3 nbl::core::matrix3x4SIMD
 #endif
 
 

examples_tests/22.RaytracedAO/common.glsl

@@ -5,7 +5,7 @@
 layout(local_size_x = WORKGROUP_SIZE) in;
 
 
-#include <irr/builtin/glsl/utils/indirect_commands.glsl>
+#include <nbl/builtin/glsl/utils/indirect_commands.glsl>
 layout(set=1, binding=0, std430, row_major) restrict readonly buffer PerInstanceStatic
 {
     ObjectStaticData_t staticData[];
@@ -20,7 +20,7 @@ layout(set=1, binding=2, std430, row_major) restrict readonly buffer PerInstance
 };
 layout(set=1, binding=3, std430) restrict coherent buffer IndirectDraws
 {
-    irr_glsl_DrawElementsIndirectCommand_t draws[];
+    nbl_glsl_DrawElementsIndirectCommand_t draws[];
 } commandBuff[2];
 
 
@@ -32,8 +32,8 @@ layout(push_constant, row_major) uniform PushConstants
 
 
 
-#include <irr/builtin/glsl/utils/culling.glsl>
-#include <irr/builtin/glsl/utils/transform.glsl>
+#include <nbl/builtin/glsl/utils/culling.glsl>
+#include <nbl/builtin/glsl/utils/transform.glsl>
 
 
 // base instance remains unchanged
@@ -51,14 +51,14 @@ void main()
     commandBuff[pc.data.currentCommandBufferIx^0x1u].draws[drawID].instanceCount = 0u;
 
     // cull
-    const mat4 MVP = irr_glsl_pseudoMul4x4with4x3(pc.data.viewProjMatrix,worldMatrix);
+    const mat4 MVP = nbl_glsl_pseudoMul4x4with4x3(pc.data.viewProjMatrix,worldMatrix);
     bool notCulled = true;
     if (false)
     {
         mat2x3 bbox;
         bbox[0] = cullData[globalObjectID].aabbMinEdge;
         bbox[1] = cullData[globalObjectID].aabbMaxEdge;
-        notCulled = irr_glsl_couldBeVisible(MVP,bbox);
+        notCulled = nbl_glsl_couldBeVisible(MVP,bbox);
     }
 
     if (notCulled)

examples_tests/22.RaytracedAO/cull.comp

@@ -12,13 +12,12 @@
 using namespace nbl;
 using namespace nbl::asset;
 using namespace nbl::video;
-using namespace nbl::scene;
 
 
 constexpr uint32_t kOptiXPixelSize = sizeof(uint16_t)*3u;
 
 
-Renderer::Renderer(IVideoDriver* _driver, IAssetManager* _assetManager, nbl::scene::ISceneManager* _smgr, core::smart_refctd_ptr<video::IGPUDescriptorSet>&& globalBackendDataDS, bool useDenoiser) :
+Renderer::Renderer(IVideoDriver* _driver, IAssetManager* _assetManager, scene::ISceneManager* _smgr, core::smart_refctd_ptr<IGPUDescriptorSet>&& globalBackendDataDS, bool useDenoiser) :
 		m_useDenoiser(useDenoiser),	m_driver(_driver), m_smgr(_smgr), m_assetManager(_assetManager), m_rrManager(ext::RadeonRays::Manager::create(m_driver)),
 		m_sceneBound(FLT_MAX,FLT_MAX,FLT_MAX,-FLT_MAX,-FLT_MAX,-FLT_MAX), /*m_renderSize{0u,0u}, */m_rightHanded(false),
 		m_globalBackendDataDS(std::move(globalBackendDataDS)), // TODO: review this member
@@ -28,9 +27,9 @@ Renderer::Renderer(IVideoDriver* _driver, IAssetManager* _assetManager, nbl::sce
 		m_rayBufferAsRR(nullptr,nullptr), m_intersectionBufferAsRR(nullptr,nullptr), m_rayCountBufferAsRR(nullptr,nullptr),
 		rrInstances(),
 #endif
-		m_lightCount(0u),
-		m_visibilityBufferAttachments{nullptr}, m_maxSamples(0u), m_samplesPerPixelPerDispatch(0u), m_rayCountPerDispatch(0u), m_framesDone(0u), m_samplesComputedPerPixel(0u),
-		m_sampleSequence(), m_scrambleTexture(), m_accumulation(), m_tonemapOutput(), m_visibilityBuffer(nullptr), tmpTonemapBuffer(nullptr), m_colorBuffer(nullptr)
+		m_indirectDrawBuffers{nullptr}, m_cullPushConstants{core::matrix4SIMD(),0u,0u,1.f,0xdeadbeefu}, m_lightCount(0u),
+		m_visibilityBuffer(nullptr), tmpTonemapBuffer(nullptr), m_colorBuffer(nullptr),
+		m_visibilityBufferAttachments{nullptr}, m_maxSamples(0u), m_samplesPerPixelPerDispatch(0u), m_rayCountPerDispatch(0u), m_framesDone(0u), m_samplesComputedPerPixel(0u)
 	#ifdef _NBL_BUILD_OPTIX_
 		,m_cudaStream(nullptr)
 	#endif
@@ -843,7 +842,7 @@ void Renderer::init(const SAssetBundle& meshes,
 	{
 		auto glsl = 
 			std::string(m_useDenoiser ? "#version 430 core\n#define USE_OPTIX_DENOISER\n" : "#version 430 core\n") +
-			//"irr/builtin/glsl/ext/RadeonRays/"
+			//"nbl/builtin/glsl/ext/RadeonRays/"
 			rr_includes->getBuiltinInclude("ray.glsl") +
 			lightStruct +
 			compostShader;

examples_tests/22.RaytracedAO/dirty_source/ExtraCrap.cpp

@@ -71,25 +71,6 @@ class Renderer : public nbl::core::IReferenceCounted, public nbl::core::Interfac
 				return *this;
 			}
 
-			struct VisibilityBufferPipelineKey
-			{
-				inline bool operator==(const VisibilityBufferPipelineKey& other) const
-				{
-					return vertexParams==other.vertexParams&&frontFaceIsCCW==other.frontFaceIsCCW;
-				}
-
-				nbl::asset::SVertexInputParams vertexParams;
-				uint8_t frontFaceIsCCW;
-			};
-			struct VisibilityBufferPipelineKeyHash
-			{
-				inline std::size_t operator()(const VisibilityBufferPipelineKey& key) const
-				{
-					std::basic_string_view view(reinterpret_cast<const char*>(&key),sizeof(key));
-					return std::hash<decltype(view)>()(view);
-				}
-			};
-			nbl::core::unordered_map<VisibilityBufferPipelineKey,nbl::core::smart_refctd_ptr<nbl::video::IGPURenderpassIndependentPipeline>,VisibilityBufferPipelineKeyHash> m_visibilityBufferFillPipelines;
 
 			nbl::core::vector<SLight> lights;
 			nbl::core::vector<nbl::core::vectorSIMDf> lightRadiances;

examples_tests/22.RaytracedAO/dirty_source/ExtraCrap.h

@@ -4,7 +4,7 @@
 
 #version 430 core
 
-#include <irr/builtin/glsl/utils/normal_encode.glsl>
+#include <nbl/builtin/glsl/utils/normal_encode.glsl>
 
 
 layout(location = 0) flat in uint ObjectID;

examples_tests/22.RaytracedAO/fillVisBuffer.frag

@@ -18,14 +18,14 @@ layout(location = 0) flat out uint ObjectID;
 layout(location = 1) out vec3 Normal;
 layout(location = 2) out vec2 UV;
 
-#include <irr/builtin/glsl/utils/transform.glsl>
+#include <nbl/builtin/glsl/utils/transform.glsl>
 
 void main()
 {
     DrawData_t self = instanceDataPerCamera.data[gl_InstanceIndex];
     ObjectID = self.objectID|(floatBitsToUint(self.detMVP)&0x80000000u); // use MSB to denote if face orientation should be flipped
 
-    gl_Position = irr_glsl_pseudoMul4x4with3x1(self.MVP,vPosition);
+    gl_Position = nbl_glsl_pseudoMul4x4with3x1(self.MVP,vPosition);
 
     const vec3 localNormal = normalize(vNormal); //have to normalize twice because of normal quantization
     Normal[0] = dot(staticData[self.objectID].normalMatrixRow0,localNormal);

examples_tests/22.RaytracedAO/fillVisBuffer.vert

@@ -2,7 +2,7 @@
 #include "raygenCommon.glsl"
 
 
-#include <irr/builtin/glsl/utils/normal_decode.glsl>
+#include <nbl/builtin/glsl/utils/normal_decode.glsl>
 //
 layout(set = 2, binding = 0, row_major) uniform RaygenData
 {
@@ -190,7 +190,7 @@ void main()
 
 		for (uint i=0u; i<pc.data.samplesPerPixelPerDispatch; i++)
 		{
-			vec3 direction; // TODO: just use irr_glsl_LightSample?
+			vec3 direction; // TODO: just use nbl_glsl_LightSample?
 			float maxT;
 			vec4 throughput = vec4(0.0,0.0,0.0,-1.0); // -1 needs to be there to ensure no backface culling on rays
 

examples_tests/22.RaytracedAO/raygen.comp

@@ -9,10 +9,10 @@ layout(local_size_x = 16, local_size_y = 16) in;
 
 //
 layout(set = 1, binding = 0, rgba32f) restrict uniform image2D framebuffer;
-#include <irr/builtin/glsl/ext/RadeonRays/ray.glsl>
+#include <nbl/builtin/glsl/ext/RadeonRays/ray.glsl>
 layout(set = 1, binding = 1, std430) restrict writeonly buffer Rays
 {
-	irr_glsl_ext_RadeonRays_ray rays[];
+	nbl_glsl_ext_RadeonRays_ray rays[];
 };
 // lights
 layout(set = 1, binding = 2, std430) restrict readonly buffer CumulativeLightPDF