Added IsDrawable method to properly skip invalid draw calls (#533)

Author: adriengivry

Sources/Overload/OvRendering/include/OvRendering/Core/ABaseRenderer.h

@@ -103,8 +103,15 @@ namespace OvRendering::Core
 			OvRendering::Settings::EBlitFlags p_flags = OvRendering::Settings::EBlitFlags::DEFAULT
 		);
 
+		/**
+		* Returns true if the entity is drawable. Should be used before submitting an entity.
+		* @param p_drawable
+		*/
+		virtual bool IsDrawable(const Entities::Drawable& p_drawable) const;
+
 		/**
 		* Draw a drawable entity
+		* @note Any submitted entity should be drawable (Use IsDrawable before)
 		* @param p_pso
 		* @param p_drawable
 		*/

Sources/Overload/OvRendering/src/OvRendering/Core/ABaseRenderer.cpp

@@ -175,53 +175,60 @@ void OvRendering::Core::ABaseRenderer::Blit(
 	p_dst.Unbind();
 }
 
+bool OvRendering::Core::ABaseRenderer::IsDrawable(const Entities::Drawable& p_drawable) const
+{
+	return
+		p_drawable.mesh &&
+		p_drawable.material &&
+		p_drawable.material->IsValid()&&
+		p_drawable.material->SupportsProjectionMode(m_frameDescriptor.camera->GetProjectionMode()) &&
+		p_drawable.material->GetGPUInstances() > 0;
+}
+
 void OvRendering::Core::ABaseRenderer::DrawEntity(
 	OvRendering::Data::PipelineState p_pso,
 	const Entities::Drawable& p_drawable
 )
 {
 	ZoneScoped;
 
-	auto material = p_drawable.material;
-	auto mesh = p_drawable.mesh;
+	OVASSERT(IsDrawable(p_drawable), "Submitted an entity that isn't properly configured!");
 
-	OVASSERT(material.has_value(), "Missing material instance!");
+	p_pso.depthWriting = p_drawable.stateMask.depthWriting;
+	p_pso.colorWriting.mask = p_drawable.stateMask.colorWriting ? 0xFF : 0x00;
+	p_pso.blending = p_drawable.stateMask.blendable;
+	p_pso.userInterface = p_drawable.stateMask.userInterface;
+	p_pso.culling = p_drawable.stateMask.frontfaceCulling || p_drawable.stateMask.backfaceCulling;
+	p_pso.depthTest = p_drawable.stateMask.depthTest;
 
-	const auto gpuInstances = material->GetGPUInstances();
-	const auto projectionMode = m_frameDescriptor.camera->GetProjectionMode();
-
-	if (mesh && material->IsValid() && material->SupportsProjectionMode(projectionMode) && gpuInstances > 0)
+	if (p_pso.culling)
 	{
-		p_pso.depthWriting = p_drawable.stateMask.depthWriting;
-		p_pso.colorWriting.mask = p_drawable.stateMask.colorWriting ? 0xFF : 0x00;
-		p_pso.blending = p_drawable.stateMask.blendable;
-		p_pso.userInterface = p_drawable.stateMask.userInterface;
-		p_pso.culling = p_drawable.stateMask.frontfaceCulling || p_drawable.stateMask.backfaceCulling;
-		p_pso.depthTest = p_drawable.stateMask.depthTest;
-
-		if (p_pso.culling)
+		if (p_drawable.stateMask.backfaceCulling && p_drawable.stateMask.frontfaceCulling)
+		{
+			p_pso.cullFace = Settings::ECullFace::FRONT_AND_BACK;
+		}
+		else
 		{
-			if (p_drawable.stateMask.backfaceCulling && p_drawable.stateMask.frontfaceCulling)
-			{
-				p_pso.cullFace = Settings::ECullFace::FRONT_AND_BACK;
-			}
-			else
-			{
-				p_pso.cullFace =
-					p_drawable.stateMask.backfaceCulling ?
-					Settings::ECullFace::BACK :
-					Settings::ECullFace::FRONT;
-			}
+			p_pso.cullFace =
+				p_drawable.stateMask.backfaceCulling ?
+				Settings::ECullFace::BACK :
+				Settings::ECullFace::FRONT;
 		}
+	}
 
-		material->Bind(
-			&m_emptyTexture->GetTexture(),
-			p_drawable.featureSetOverride.has_value() ?
-			OvTools::Utils::OptRef<const Data::FeatureSet>(p_drawable.featureSetOverride.value()) :
-			std::nullopt
-		);
+	p_drawable.material->Bind(
+		&m_emptyTexture->GetTexture(),
+		p_drawable.featureSetOverride.has_value() ?
+		OvTools::Utils::OptRef<const Data::FeatureSet>(p_drawable.featureSetOverride.value()) :
+		std::nullopt
+	);
 
-		m_driver.Draw(p_pso, mesh.value(), p_drawable.primitiveMode, gpuInstances);
-		material->Unbind();
-	}
+	m_driver.Draw(
+		p_pso,
+		p_drawable.mesh.value(),
+		p_drawable.primitiveMode,
+		p_drawable.material->GetGPUInstances()
+	);
+
+	p_drawable.material->Unbind();
 }

Sources/Overload/OvRendering/src/OvRendering/Core/CompositeRenderer.cpp

@@ -91,6 +91,13 @@ void OvRendering::Core::CompositeRenderer::DrawEntity(
 {
 	ZoneScoped;
 
+	// Ensure the drawable is valid.
+	// If not, skip the draw call and the attached features.
+	if (!IsDrawable(p_drawable))
+	{
+		return;
+	}
+
 	for (const auto& [_, feature] : m_features)
 	{
 		if (feature->IsEnabled())