Rendering improvements

demos/audiovisualfft/data/objects.json

@@ -1237,7 +1237,7 @@
             "Children": []
         },
         {
-            "Type": "nap::RenderTarget",
+            "Type": "nap::ColorDepthRenderTarget",
             "mID": "RenderTarget",
             "ColorTexture": "ColorTexture",
             "DepthTexture": "DepthTexture",

demos/audiovisualfft/module/src/renderdofcomponent.cpp

@@ -9,14 +9,11 @@
 #include "gpubuffer.h"
 #include "renderglobals.h"
 #include "uniforminstance.h"
-#include "renderglobals.h"
 #include "dofshader.h"
 #include "textureutils.h"
 
 // External Includes
 #include <entity.h>
-#include <glm/gtc/matrix_transform.hpp>
-#include <entity.h>
 #include <nap/core.h>
 #include <orthocameracomponent.h>
 
@@ -62,10 +59,6 @@ namespace nap
 		if (!errorState.check(mResource->mInputTarget != nullptr, "InputTarget not set"))
 			return false;
 
-		// Verify the render target has a depth texture resource
-		if (!errorState.check(mResource->mInputTarget->hasDepthTexture(), "The specified InputTarget has no depth texture resource"))
-			return false;
-
 		// Get render service
 		mRenderService = getEntityInstance()->getCore()->getService<RenderService>();
 

demos/audiovisualfft/module/src/renderdofcomponent.h

@@ -6,6 +6,7 @@
 
 // External Includes
 #include <rendercomponent.h>
+#include <colordepthrendertarget.h>
 #include <componentptr.h>
 #include <perspcameracomponent.h>
 #include <materialinstance.h>
@@ -31,7 +32,7 @@ namespace nap
 		DECLARE_COMPONENT(RenderDOFComponent, RenderDOFComponentInstance)
 	public:
 		ComponentPtr<PerspCameraComponent>	mCamera;						///< Property: 'Camera'
-		ResourcePtr<RenderTarget>			mInputTarget;					///< Property: 'InputTarget' the input color target, must be copyable
+		ResourcePtr<ColorDepthRenderTarget>	mInputTarget;					///< Property: 'InputTarget' the input color depth target, must be copyable
 		ResourcePtr<RenderTexture2D>		mOutputTexture;					///< Property: 'OutputTexture' the output color texture
 
 		ResourcePtr<ParameterFloat>			mAperture;

demos/computeflocking/module/src/selectmeshcomponent.cpp

@@ -53,7 +53,7 @@ namespace nap
 		}
 
 		// Make sure we have some meshes
-		if (!errorState.check(mMeshes.size() > 0, "No mesh files to select"))
+		if (!errorState.check(!mMeshes.empty(), "No mesh files to select"))
 			return false;
 
 		// Select the mesh to display based on resource index

system_modules/naprender/src/bufferbinding.cpp

@@ -43,10 +43,6 @@ RTTI_BEGIN_CLASS(nap::BufferBindingIVec4, "Vector (ivec4) shader buffer binding"
 	RTTI_PROPERTY("Buffer", &nap::BufferBindingIVec4::mBuffer, nap::rtti::EPropertyMetaData::Required, "IVec4 data to bind")
 RTTI_END_CLASS
 
-RTTI_BEGIN_CLASS(nap::BufferBindingUVec4, "Vector (uvec4) shader buffer binding")
-	RTTI_PROPERTY("Buffer", &nap::BufferBindingUVec4::mBuffer, nap::rtti::EPropertyMetaData::Required, "UVec4 data to bind")
-RTTI_END_CLASS
-
 RTTI_BEGIN_CLASS(nap::BufferBindingMat4, "Matrix (4x4) shader buffer binding")
 	RTTI_PROPERTY("Buffer", &nap::BufferBindingMat4::mBuffer, nap::rtti::EPropertyMetaData::Required, "Mat4 data to bind")
 RTTI_END_CLASS

system_modules/naprender/src/bufferbinding.h

@@ -183,7 +183,6 @@ namespace nap
 	using BufferBindingVec3		= TypedBufferBindingNumeric<glm::vec3>;
 	using BufferBindingVec4		= TypedBufferBindingNumeric<glm::vec4>;
 	using BufferBindingIVec4	= TypedBufferBindingNumeric<glm::ivec4>;
-	using BufferBindingUVec4	= TypedBufferBindingNumeric<glm::uvec4>;
 	using BufferBindingMat4		= TypedBufferBindingNumeric<glm::mat4>;
 
 

system_modules/naprender/src/bufferbindinginstance.cpp

@@ -39,10 +39,6 @@ RTTI_BEGIN_CLASS_NO_DEFAULT_CONSTRUCTOR(nap::BufferBindingIVec4Instance)
 	RTTI_CONSTRUCTOR(const std::string&, const nap::ShaderVariableValueArrayDeclaration&, const nap::BufferBindingChangedCallback&)
 RTTI_END_CLASS
 
-RTTI_BEGIN_CLASS_NO_DEFAULT_CONSTRUCTOR(nap::BufferBindingUVec4Instance)
-	RTTI_CONSTRUCTOR(const std::string&, const nap::ShaderVariableValueArrayDeclaration&, const nap::BufferBindingChangedCallback&)
-RTTI_END_CLASS
-
 RTTI_BEGIN_CLASS_NO_DEFAULT_CONSTRUCTOR(nap::BufferBindingMat4Instance)
 	RTTI_CONSTRUCTOR(const std::string&, const nap::ShaderVariableValueArrayDeclaration&, const nap::BufferBindingChangedCallback&)
 RTTI_END_CLASS
@@ -177,11 +173,6 @@ namespace nap
 				return createBufferBindingInstance<BufferBindingIVec4Instance, BufferBindingIVec4, ShaderVariableValueArrayDeclaration>(
 					binding_name, *value_array_declaration, binding, bufferChangedCallback, errorState);
 			}
-			else if (value_array_declaration->mElementType == EShaderVariableValueType::UVec4)
-			{
-				return createBufferBindingInstance<BufferBindingUVec4Instance, BufferBindingUVec4, ShaderVariableValueArrayDeclaration>(
-					binding_name, *value_array_declaration, binding, bufferChangedCallback, errorState);
-			}
 			else if (value_array_declaration->mElementType == EShaderVariableValueType::Mat4)
 			{
 				return createBufferBindingInstance<BufferBindingMat4Instance, BufferBindingMat4, ShaderVariableValueArrayDeclaration>(
@@ -194,31 +185,39 @@ namespace nap
 		// values or structs are declared inside a storage buffer block. Notify the user and return false.
 		else if (declaration_type == RTTI_OF(ShaderVariableStructDeclaration) || declaration_type == RTTI_OF(ShaderVariableValueDeclaration))
 		{
-			NAP_ASSERT_MSG(false, "Individual values (or structs) not supported for buffer bindings.");
+			NAP_ASSERT_MSG(false, "Individual values (or structs) not supported for buffer bindings.")
 		}
 		else if (declaration_type == RTTI_OF(ShaderVariableStructArrayDeclaration))
 		{
 			NAP_ASSERT_MSG(false, "Declaration type 'ShaderVariableStructArrayDeclaration' is not supported for buffer bindings. Use 'ShaderVariableStructBufferDeclaration' instead.");
 		}
 
-		NAP_ASSERT_MSG(false, "Unsupported shader variable declaration");
+		NAP_ASSERT_MSG(false, "Unsupported shader variable declaration")
 		return nullptr;
 	}
 
 
 	void BufferBindingStructInstance::setBuffer(StructBuffer& buffer)
 	{
-		NAP_ASSERT_MSG(mDeclaration->mStride == buffer.getElementSize(), "Buffer declaration stride is not equal to buffer element size");
-		BufferBindingInstance::mBuffer = &buffer;
+		NAP_ASSERT_MSG(mDeclaration->mStride == buffer.getElementSize(), "Buffer declaration stride is not equal to buffer element size")
+		if (mBuffer != nullptr)
+			mBuffer->bufferChanged.disconnect(mBufferChangedSlot);
+
+		mBuffer = &buffer;
+		mBuffer->bufferChanged.connect(mBufferChangedSlot);
 		raiseChanged();
 	}
 
 
 	void BufferBindingStructInstance::setBuffer(const BufferBindingStruct& resource)
 	{
 		assert(resource.mBuffer != nullptr);
-		NAP_ASSERT_MSG(mDeclaration->mStride == resource.mBuffer->getElementSize(), "Buffer declaration stride is not equal to buffer element size");
-		BufferBindingInstance::mBuffer = resource.mBuffer.get();
+		NAP_ASSERT_MSG(mDeclaration->mStride == resource.mBuffer->getElementSize(), "Buffer declaration stride is not equal to buffer element size")
+		if (mBuffer != nullptr)
+			mBuffer->bufferChanged.disconnect(mBufferChangedSlot);
+
+		mBuffer = resource.mBuffer.get();
+		mBuffer->bufferChanged.connect(mBufferChangedSlot);
 		raiseChanged();
 	}
 }

system_modules/naprender/src/bufferbindinginstance.h

@@ -228,6 +228,10 @@ namespace nap
 		 */
 		void raiseChanged()									{ if (mBindingChangedCallback) mBindingChangedCallback(*this); }
 
+		// To be called when dynamic buffers are updated by upload
+		// This requires the descriptor buffer info in the material instance to be updated
+		nap::Slot<> mBufferChangedSlot = { [&]() -> void { raiseChanged(); } };
+
 		const ShaderVariableStructBufferDeclaration*		mDeclaration;
 	};
 
@@ -295,7 +299,7 @@ namespace nap
 		void setBuffer(TypedGPUBufferNumeric<T>& buffer);
 
 		/**
-		 * Updates thebuffer from a resource.
+		 * Updates the buffer from a resource.
 		 * @param resource resource to set buffer from.
 		 */
 		void setBuffer(const TypedBufferBindingNumeric<T>& resource);
@@ -315,6 +319,10 @@ namespace nap
 		 * Called when the buffer changes
 		 */
 		void raiseChanged()														{ if (mBindingChangedCallback) mBindingChangedCallback(*this); }
+
+		// To be called when dynamic buffers are updated by upload
+		// This requires the descriptor buffer info in the material instance to be updated
+		nap::Slot<> mBufferChangedSlot = { [&]() -> void { raiseChanged(); } };
 	};
 
 
@@ -329,7 +337,6 @@ namespace nap
 	using BufferBindingVec3Instance		= TypedBufferBindingNumericInstance<glm::vec3>;
 	using BufferBindingVec4Instance		= TypedBufferBindingNumericInstance<glm::vec4>;
 	using BufferBindingIVec4Instance	= TypedBufferBindingNumericInstance<glm::ivec4>;
-	using BufferBindingUVec4Instance	= TypedBufferBindingNumericInstance<glm::uvec4>;
 	using BufferBindingMat4Instance		= TypedBufferBindingNumericInstance<glm::mat4>;
 
 
@@ -340,16 +347,26 @@ namespace nap
 	template<class T>
 	void TypedBufferBindingNumericInstance<T>::setBuffer(TypedGPUBufferNumeric<T>& buffer)
 	{
-		NAP_ASSERT_MSG(mDeclaration->mStride == buffer.getElementSize(), "Buffer declaration stride is not equal to buffer element size");
-		BufferBindingInstance::mBuffer = &buffer;
+		NAP_ASSERT_MSG(mDeclaration->mStride == buffer.getElementSize(), "Buffer declaration stride is not equal to buffer element size")
+
+		if (mBuffer != nullptr)
+			mBuffer->bufferChanged.disconnect(mBufferChangedSlot);
+
+		mBuffer = &buffer;
+		mBuffer->bufferChanged.connect(mBufferChangedSlot);
 		raiseChanged();
 	}
 
 	template<class T>
 	void TypedBufferBindingNumericInstance<T>::setBuffer(const TypedBufferBindingNumeric<T>& resource)
 	{
-		NAP_ASSERT_MSG(mDeclaration->mStride == resource.mBuffer.getElementSize(), "Buffer declaration stride is not equal to buffer element size");
-		BufferBindingInstance::mBuffer = resource.mBuffer.get();
+		NAP_ASSERT_MSG(mDeclaration->mStride == resource.mBuffer.getElementSize(), "Buffer declaration stride is not equal to buffer element size")
+
+		if (mBuffer != nullptr)
+			mBuffer->bufferChanged.disconnect(mBufferChangedSlot);
+
+		mBuffer = resource.mBuffer.get();
+		mBuffer->bufferChanged.connect(mBufferChangedSlot);
 		raiseChanged();
 	}
 }

system_modules/naprender/src/gpubuffer.cpp

@@ -486,7 +486,7 @@ namespace nap
 		// The vkCmdFillBuffer/clear command is treated as a TRANSFER operation
 		// Clear commands are recorded to the upload command buffer and always happen at the beginning of a frame
 		// Therefore, no initial memory barrier is required
-		vkCmdFillBuffer(commandBuffer, mRenderBuffers[0].mBuffer, 0, VK_WHOLE_SIZE, 0);
+		vkCmdFillBuffer(commandBuffer, mRenderBuffers[mCurrentRenderBufferIndex].mBuffer, 0, VK_WHOLE_SIZE, 0);
 
 		// Determine dest access flags for memory barrier
 		VkBufferUsageFlags usage = getBufferUsageFlags();
@@ -502,7 +502,7 @@ namespace nap
 		dst_stage |= (usage & VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT || usage & VK_BUFFER_USAGE_STORAGE_BUFFER_BIT) ? VK_PIPELINE_STAGE_VERTEX_SHADER_BIT : 0;
 
 		// Memory barrier
-		memoryBarrier(commandBuffer, mRenderBuffers[0].mBuffer, VK_ACCESS_TRANSFER_WRITE_BIT, dst_access, VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stage);
+		memoryBarrier(commandBuffer, mRenderBuffers[mCurrentRenderBufferIndex].mBuffer, VK_ACCESS_TRANSFER_WRITE_BIT, dst_access, VK_PIPELINE_STAGE_TRANSFER_BIT, dst_stage);
 	}
 
 

system_modules/naprender/src/materialcommon.h

@@ -68,7 +68,7 @@ namespace nap
 	/**
 	 * Hash value for shader specialization constants
 	 */
-	using ShaderConstantHash = uint;
+	using ShaderConstantHash = size_t;
 
 
 	/**