Procházet zdrojové kódy

Cleaning up renderer

Panagiotis Christopoulos Charitos před 10 roky
rodič
revize
42b7a60714

+ 0 - 46
include/anki/renderer/Dp.h

@@ -1,46 +0,0 @@
-// Copyright (C) 2009-2015, Panagiotis Christopoulos Charitos.
-// All rights reserved.
-// Code licensed under the BSD License.
-// http://www.anki3d.org/LICENSE
-
-#ifndef ANKI_RENDERER_DP_H
-#define ANKI_RENDERER_DP_H
-
-#include "anki/renderer/RenderingPass.h"
-#include "anki/Gr.h"
-
-namespace anki {
-
-/// @addtogroup renderer
-/// @{
-
-/// Depth buffer processing.
-class Dp: public RenderingPass
-{
-public:
-	/// @privatesection
-	/// @{
-	Dp(Renderer* r)
-	:	RenderingPass(r)
-	{}
-
-	TextureHandle& getSmallDepthRt()
-	{
-		return m_smallDepthRt;
-	}
-
-	ANKI_USE_RESULT Error init(const ConfigSet& initializer);
-	ANKI_USE_RESULT Error run(CommandBufferHandle& cmdBuff);
-	/// @}
-
-private:
-	TextureHandle m_smallDepthRt; ///< A smaller depth buffer
-	FramebufferHandle m_smallDepthFb; ///< Used to blit
-	UVec2 m_smallDepthSize;
-};
-/// @}
-
-} // end namespace anki
-
-#endif
-

+ 2 - 0
include/anki/renderer/Pps.h

@@ -99,6 +99,8 @@ private:
 	PipelineHandle m_ppline;
 	TextureHandle m_rt;
 
+	TextureResourcePointer m_lut; ///< Color grading lookup texture.
+
 	Pps(Renderer* r);
 	~Pps();
 

+ 0 - 11
include/anki/renderer/Renderer.h

@@ -16,7 +16,6 @@
 #include "anki/scene/Forward.h"
 
 #include "anki/renderer/Ms.h"
-#include "anki/renderer/Dp.h"
 #include "anki/renderer/Is.h"
 #include "anki/renderer/Pps.h"
 #include "anki/renderer/Dbg.h"
@@ -53,15 +52,6 @@ public:
 		return m_ms;
 	}
 
-	const Dp& getDp() const
-	{
-		return m_dp;
-	}
-	Dp& getDp()
-	{
-		return m_dp;
-	}
-
 	const Is& getIs() const
 	{
 		return m_is;
@@ -289,7 +279,6 @@ private:
 	/// @name Rendering stages
 	/// @{
 	Ms m_ms; ///< Material rendering stage
-	Dp m_dp; ///< Depth processing stage.
 	Is m_is; ///< Illumination rendering stage
 	Pps m_pps; ///< Postprocessing rendering stage
 	Fs* m_fs = nullptr; ///< Forward shading.

+ 0 - 51
src/renderer/Dp.cpp

@@ -1,51 +0,0 @@
-// Copyright (C) 2009-2015, Panagiotis Christopoulos Charitos.
-// All rights reserved.
-// Code licensed under the BSD License.
-// http://www.anki3d.org/LICENSE
-
-#include "anki/renderer/Dp.h"
-#include "anki/renderer/Renderer.h"
-
-namespace anki {
-
-//==============================================================================
-Error Dp::init(const ConfigSet& config)
-{
-	m_smallDepthSize = UVec2(
-		getAlignedRoundDown(16, m_r->getWidth() / 3),
-		getAlignedRoundDown(16, m_r->getHeight() / 3));
-
-	ANKI_CHECK(m_r->createRenderTarget(
-		m_smallDepthSize.x(), m_smallDepthSize.y(),
-		PixelFormat(ComponentFormat::D24, TransformFormat::FLOAT),
-		1, SamplingFilter::LINEAR, 1, m_smallDepthRt));
-
-	GrManager& gl = getGrManager();
-	CommandBufferHandle cmdb;
-	ANKI_CHECK(cmdb.create(&gl));
-
-	FramebufferHandle::Initializer fbInit;
-	fbInit.m_depthStencilAttachment.m_texture = m_smallDepthRt;
-	ANKI_CHECK(m_smallDepthFb.create(cmdb, fbInit));
-
-	cmdb.finish();
-
-	return ErrorCode::NONE;
-}
-
-//==============================================================================
-Error Dp::run(CommandBufferHandle& cmdb)
-{
-	m_smallDepthFb.blit(
-		cmdb, 
-		m_r->getMs().getFramebuffer(), 
-		{{0, 0, m_r->getWidth(), m_r->getHeight()}},
-		{{0, 0, m_smallDepthSize.x(), m_smallDepthSize.y()}},
-		GL_DEPTH_BUFFER_BIT, 
-		false);
-
-	return ErrorCode::NONE;
-}
-
-} // end namespace anki
-

+ 0 - 4
src/renderer/Renderer.cpp

@@ -16,7 +16,6 @@ namespace anki {
 //==============================================================================
 Renderer::Renderer()
 :	m_ms(this), 
-	m_dp(this), 
 	m_is(this),
 	m_pps(this),
 	m_dbg(this), 
@@ -124,7 +123,6 @@ Error Renderer::initInternal(const ConfigSet& config)
 	ANKI_CHECK(m_tiler.init());
 
 	ANKI_CHECK(m_ms.init(config));
-	ANKI_CHECK(m_dp.init(config));
 	ANKI_CHECK(m_is.init(config));
 	
 	m_fs = m_alloc.newInstance<Fs>(this);
@@ -182,8 +180,6 @@ Error Renderer::render(SceneGraph& scene,
 
 	ANKI_CHECK(m_fs->run(cmdBuff[1])); 
 
-	ANKI_CHECK(m_dp.run(cmdBuff[1]));
-
 	ANKI_COUNTER_START_TIMER(RENDERER_PPS_TIME);
 	if(m_pps.getEnabled())
 	{