Browse Source

Removing unneeded error checking

Panagiotis Christopoulos Charitos 10 years ago
parent
commit
9ac78d8533

+ 2 - 2
include/anki/renderer/Bloom.h

@@ -26,7 +26,7 @@ class Bloom: public RenderingPass
 
 public:
 	Bloom(Renderer* r)
-	:	RenderingPass(r)
+		: RenderingPass(r)
 	{}
 
 	~Bloom();
@@ -67,7 +67,7 @@ private:
 	F32 m_scale = 1.0;
 	U32 m_blurringIterationsCount = 2; ///< The blurring iterations
 	F32 m_blurringDist = 1.0; ///< Distance in blurring
-	
+
 	FramebufferPtr m_hblurFb;
 	FramebufferPtr m_vblurFb;
 

+ 1 - 1
include/anki/renderer/Pps.h

@@ -24,7 +24,7 @@ public:
 	/// @privatesection
 	/// @{
 	ANKI_USE_RESULT Error init(const ConfigSet& config);
-	ANKI_USE_RESULT Error run(CommandBufferPtr& jobs);
+	void run(CommandBufferPtr& jobs);
 
 	const TexturePtr& getRt() const
 	{

+ 1 - 1
include/anki/renderer/Renderer.h

@@ -213,7 +213,7 @@ public:
 	}
 
 	/// Create a framebuffer attachment texture
-	ANKI_USE_RESULT Error createRenderTarget(U32 w, U32 h,
+	void createRenderTarget(U32 w, U32 h,
 		const PixelFormat& format, U32 samples, SamplingFilter filter,
 		U mipsCount, TexturePtr& rt);
 

+ 3 - 4
include/anki/renderer/RenderingPass.h

@@ -28,7 +28,7 @@ class RenderingPass
 {
 public:
 	RenderingPass(Renderer* r)
-	:	m_r(r)
+		: m_r(r)
 	{}
 
 	~RenderingPass()
@@ -66,7 +66,7 @@ protected:
 	U32 m_blurringIterationsCount = 1; ///< The blurring iterations
 
 	BlurringRenderingPass(Renderer* r)
-	:	RenderingPass(r)
+		: RenderingPass(r)
 	{}
 
 	class Direction
@@ -89,9 +89,8 @@ protected:
 	ANKI_USE_RESULT Error initBlurring(Renderer& r, U width, U height, U samples,
 		F32 blurringDistance);
 
-	ANKI_USE_RESULT Error runBlurring(Renderer& r, CommandBufferPtr& jobs);
+	void runBlurring(Renderer& r, CommandBufferPtr& jobs);
 };
-
 /// @}
 
 } // end namespace anki

+ 4 - 5
include/anki/renderer/Ssao.h

@@ -24,13 +24,13 @@ public:
 	/// @privatesection
 	/// @{
 	Ssao(Renderer* r)
-	:	RenderingPass(r)
+		: RenderingPass(r)
 	{}
 
 	ANKI_USE_RESULT Error init(const ConfigSet& initializer);
-	ANKI_USE_RESULT Error run(CommandBufferPtr& cmdBuff);
+	void run(CommandBufferPtr& cmdBuff);
 
-	TexturePtr& _getRt()
+	TexturePtr& getRt()
 	{
 		return m_vblurRt;
 	}
@@ -56,7 +56,7 @@ private:
 	PipelinePtr m_ssaoPpline;
 	PipelinePtr m_hblurPpline;
 	PipelinePtr m_vblurPpline;
-	
+
 	Timestamp m_commonUboUpdateTimestamp = 0;
 	BufferPtr m_uniformsBuff;
 	TexturePtr m_noiseTex;
@@ -65,7 +65,6 @@ private:
 		FramebufferPtr& fb, TexturePtr& rt);
 	ANKI_USE_RESULT Error initInternal(const ConfigSet& initializer);
 };
-
 /// @}
 
 } // end namespace anki

+ 1 - 1
include/anki/renderer/Sslr.h

@@ -25,7 +25,7 @@ public:
 	{}
 
 	ANKI_USE_RESULT Error init(const ConfigSet& config);
-	ANKI_USE_RESULT Error run(CommandBufferPtr& cmdBuff);
+	void run(CommandBufferPtr& cmdBuff);
 	/// @}
 
 private:

+ 2 - 2
src/renderer/Bloom.cpp

@@ -20,9 +20,9 @@ Bloom::~Bloom()
 Error Bloom::initFb(FramebufferPtr& fb, TexturePtr& rt)
 {
 	// Set to bilinear because the blurring techniques take advantage of that
-	ANKI_CHECK(m_r->createRenderTarget(m_width, m_height,
+	m_r->createRenderTarget(m_width, m_height,
 		PixelFormat(ComponentFormat::R8G8B8, TransformFormat::UNORM),
-		1, SamplingFilter::LINEAR, 1, rt));
+		1, SamplingFilter::LINEAR, 1, rt);
 
 	// Create FB
 	FramebufferPtr::Initializer fbInit;

+ 2 - 2
src/renderer/Is.cpp

@@ -218,10 +218,10 @@ Error Is::initInternal(const ConfigSet& config)
 	// Create framebuffer
 	//
 
-	ANKI_CHECK(m_r->createRenderTarget(
+	m_r->createRenderTarget(
 		m_r->getWidth(), m_r->getHeight(),
 		PixelFormat(ComponentFormat::R11G11B10, TransformFormat::FLOAT),
-		1, SamplingFilter::LINEAR, MIPMAPS_COUNT, m_rt));
+		1, SamplingFilter::LINEAR, MIPMAPS_COUNT, m_rt);
 
 	FramebufferPtr::Initializer fbInit;
 	fbInit.m_colorAttachmentsCount = 1;

+ 8 - 8
src/renderer/Ms.cpp

@@ -23,21 +23,21 @@ Error Ms::createRt(U32 index, U32 samples)
 {
 	Plane& plane = m_planes[index];
 
-	ANKI_CHECK(m_r->createRenderTarget(m_r->getWidth(), m_r->getHeight(),
+	m_r->createRenderTarget(m_r->getWidth(), m_r->getHeight(),
 		PixelFormat(ComponentFormat::D24, TransformFormat::FLOAT),
-		samples, SamplingFilter::NEAREST, 4, plane.m_depthRt));
+		samples, SamplingFilter::NEAREST, 4, plane.m_depthRt);
 
-	ANKI_CHECK(m_r->createRenderTarget(m_r->getWidth(), m_r->getHeight(),
+	m_r->createRenderTarget(m_r->getWidth(), m_r->getHeight(),
 		PixelFormat(ComponentFormat::R8G8B8A8, TransformFormat::UNORM),
-		samples, SamplingFilter::NEAREST, 1, plane.m_rt0));
+		samples, SamplingFilter::NEAREST, 1, plane.m_rt0);
 
-	ANKI_CHECK(m_r->createRenderTarget(m_r->getWidth(), m_r->getHeight(),
+	m_r->createRenderTarget(m_r->getWidth(), m_r->getHeight(),
 		PixelFormat(ComponentFormat::R8G8B8A8, TransformFormat::UNORM),
-		samples, SamplingFilter::NEAREST, 1, plane.m_rt1));
+		samples, SamplingFilter::NEAREST, 1, plane.m_rt1);
 
-	ANKI_CHECK(m_r->createRenderTarget(m_r->getWidth(), m_r->getHeight(),
+	m_r->createRenderTarget(m_r->getWidth(), m_r->getHeight(),
 		PixelFormat(ComponentFormat::R10G10B10A2, TransformFormat::UNORM),
-		samples, SamplingFilter::NEAREST, 1, plane.m_rt2));
+		samples, SamplingFilter::NEAREST, 1, plane.m_rt2);
 
 	AttachmentLoadOperation loadop = AttachmentLoadOperation::DONT_CARE;
 #if ANKI_DEBUG

+ 7 - 10
src/renderer/Pps.cpp

@@ -19,7 +19,7 @@ namespace anki {
 
 //==============================================================================
 Pps::Pps(Renderer* r)
-:	RenderingPass(r)
+	: RenderingPass(r)
 {}
 
 //==============================================================================
@@ -53,11 +53,10 @@ Error Pps::initInternal(const ConfigSet& config)
 	ANKI_CHECK(m_sslf->init(config));
 
 	// FBO
-	ANKI_CHECK(
-		m_r->createRenderTarget(
+	m_r->createRenderTarget(
 		m_r->getWidth(), m_r->getHeight(),
 		PixelFormat(ComponentFormat::R8G8B8, TransformFormat::UNORM),
-		1, SamplingFilter::LINEAR, 1, m_rt));
+		1, SamplingFilter::LINEAR, 1, m_rt);
 
 	FramebufferPtr::Initializer fbInit;
 	fbInit.m_colorAttachmentsCount = 1;
@@ -115,20 +114,20 @@ Error Pps::loadColorGradingTexture(CString filename)
 }
 
 //==============================================================================
-Error Pps::run(CommandBufferPtr& cmdb)
+void Pps::run(CommandBufferPtr& cmdb)
 {
 	ANKI_ASSERT(m_enabled);
 
 	// First SSAO because it depends on MS where HDR depends on IS
 	if(m_ssao->getEnabled())
 	{
-		ANKI_CHECK(m_ssao->run(cmdb));
+		m_ssao->run(cmdb);
 	}
 
 	// Then SSLR because HDR depends on it
 	if(m_sslr->getEnabled())
 	{
-		ANKI_CHECK(m_sslr->run(cmdb));
+		m_sslr->run(cmdb);
 	}
 
 	m_r->getIs().generateMipmaps(cmdb);
@@ -163,7 +162,7 @@ Error Pps::run(CommandBufferPtr& cmdb)
 
 	if(m_ssao->getEnabled())
 	{
-		m_ssao->_getRt().bind(cmdb, 1);
+		m_ssao->getRt().bind(cmdb, 1);
 	}
 
 	if(m_bloom->getEnabled())
@@ -181,8 +180,6 @@ Error Pps::run(CommandBufferPtr& cmdb)
 	m_tm->getAverageLuminanceBuffer().bindShaderBuffer(cmdb, 0);
 
 	m_r->drawQuad(cmdb);
-
-	return ErrorCode::NONE;
 }
 
 } // end namespace anki

+ 2 - 4
src/renderer/Renderer.cpp

@@ -169,7 +169,7 @@ Error Renderer::render(SceneNode& frustumableNode,
 	ANKI_COUNTER_START_TIMER(RENDERER_PPS_TIME);
 	if(m_pps->getEnabled())
 	{
-		ANKI_CHECK(m_pps->run(cmdBuff[1]));
+		m_pps->run(cmdBuff[1]);
 	}
 	ANKI_COUNTER_STOP_TIMER_INC(RENDERER_PPS_TIME);
 
@@ -226,7 +226,7 @@ Vec3 Renderer::unproject(const Vec3& windowCoords, const Mat4& modelViewMat,
 }
 
 //==============================================================================
-Error Renderer::createRenderTarget(U32 w, U32 h, const PixelFormat& format,
+void Renderer::createRenderTarget(U32 w, U32 h, const PixelFormat& format,
 	U32 samples, SamplingFilter filter, U mipsCount, TexturePtr& rt)
 {
 	// Not very important but keep the resulution of render targets aligned to
@@ -263,8 +263,6 @@ Error Renderer::createRenderTarget(U32 w, U32 h, const PixelFormat& format,
 
 	rt.create(cmdBuff, init);
 	cmdBuff.finish();
-
-	return ErrorCode::NONE;
 }
 
 //==============================================================================

+ 3 - 6
src/renderer/RenderingPass.cpp

@@ -71,9 +71,9 @@ Error BlurringRenderingPass::initBlurring(
 	{
 		Direction& dir = m_dirs[i];
 
-		ANKI_CHECK(r.createRenderTarget(width, height,
+		r.createRenderTarget(width, height,
 			PixelFormat(ComponentFormat::R8G8B8, TransformFormat::UNORM),
-			1, SamplingFilter::LINEAR, 1, dir.m_rt));
+			1, SamplingFilter::LINEAR, 1, dir.m_rt);
 
 		// Create FB
 		FramebufferPtr::Initializer fbInit;
@@ -95,8 +95,7 @@ Error BlurringRenderingPass::initBlurring(
 }
 
 //==============================================================================
-Error BlurringRenderingPass::runBlurring(
-	Renderer& r, CommandBufferPtr& cmdb)
+void BlurringRenderingPass::runBlurring(Renderer& r, CommandBufferPtr& cmdb)
 {
 	// H pass input
 	m_dirs[enumToValue(DirectionEnum::VERTICAL)].m_rt.bind(cmdb, 1);
@@ -116,8 +115,6 @@ Error BlurringRenderingPass::runBlurring(
 		m_dirs[enumToValue(DirectionEnum::VERTICAL)].m_ppline.bind(cmdb);
 		r.drawQuad(cmdb);
 	}
-
-	return ErrorCode::NONE;
 }
 
 } // end namespace anki

+ 3 - 5
src/renderer/Ssao.cpp

@@ -71,9 +71,9 @@ public:
 Error Ssao::createFb(FramebufferPtr& fb, TexturePtr& rt)
 {
 	// Set to bilinear because the blurring techniques take advantage of that
-	ANKI_CHECK(m_r->createRenderTarget(m_width, m_height,
+	m_r->createRenderTarget(m_width, m_height,
 		PixelFormat(ComponentFormat::R8, TransformFormat::UNORM),
-		1, SamplingFilter::LINEAR, 1, rt));
+		1, SamplingFilter::LINEAR, 1, rt);
 
 	// Create FB
 	FramebufferPtr::Initializer fbInit;
@@ -232,7 +232,7 @@ Error Ssao::init(const ConfigSet& config)
 }
 
 //==============================================================================
-Error Ssao::run(CommandBufferPtr& cmdb)
+void Ssao::run(CommandBufferPtr& cmdb)
 {
 	ANKI_ASSERT(m_enabled);
 
@@ -291,8 +291,6 @@ Error Ssao::run(CommandBufferPtr& cmdb)
 		m_vblurPpline.bind(cmdb);
 		m_r->drawQuad(cmdb);
 	}
-
-	return ErrorCode::NONE;
 }
 
 } // end namespace anki

+ 2 - 2
src/renderer/Sslf.cpp

@@ -50,10 +50,10 @@ Error Sslf::initInternal(const ConfigSet& config)
 		"engine_data/lens_dirt.ankitex", &getResourceManager()));
 
 	// Create the render target and FB
-	ANKI_CHECK(m_r->createRenderTarget(m_r->getPps().getBloom().getWidth(),
+	m_r->createRenderTarget(m_r->getPps().getBloom().getWidth(),
 		m_r->getPps().getBloom().getHeight(),
 		PixelFormat(ComponentFormat::R8G8B8, TransformFormat::UNORM),
-		1, SamplingFilter::LINEAR, 1, m_rt));
+		1, SamplingFilter::LINEAR, 1, m_rt);
 
 	FramebufferPtr::Initializer fbInit;
 	fbInit.m_colorAttachmentsCount = 1;

+ 4 - 7
src/renderer/Sslr.cpp

@@ -62,10 +62,9 @@ Error Sslr::init(const ConfigSet& config)
 	{
 		Direction& dir = m_dirs[U(DirectionEnum::VERTICAL)];
 
-		ANKI_CHECK(
-			m_r->createRenderTarget(m_width, m_height,
+		m_r->createRenderTarget(m_width, m_height,
 			PixelFormat(ComponentFormat::R11G11B10, TransformFormat::FLOAT),
-			1, SamplingFilter::LINEAR, 1, dir.m_rt));
+			1, SamplingFilter::LINEAR, 1, dir.m_rt);
 
 		// Create FB
 		FramebufferPtr::Initializer fbInit;
@@ -80,7 +79,7 @@ Error Sslr::init(const ConfigSet& config)
 }
 
 //==============================================================================
-Error Sslr::run(CommandBufferPtr& cmdBuff)
+void Sslr::run(CommandBufferPtr& cmdBuff)
 {
 	ANKI_ASSERT(m_enabled);
 
@@ -108,7 +107,7 @@ Error Sslr::run(CommandBufferPtr& cmdBuff)
 	//
 	if(m_blurringIterationsCount > 0)
 	{
-		ANKI_CHECK(runBlurring(*m_r, cmdBuff));
+		runBlurring(*m_r, cmdBuff);
 	}
 
 	// Write the reflection back to IS RT
@@ -125,8 +124,6 @@ Error Sslr::run(CommandBufferPtr& cmdBuff)
 	m_r->drawQuad(cmdBuff);
 
 	cmdBuff.enableBlend(false);
-
-	return ErrorCode::NONE;
 }
 
 } // end namespace anki