Moving some files around

AnKi/Renderer.h

@@ -22,7 +22,7 @@
 #include <AnKi/Renderer/IndirectSpecular.h>
 #include <AnKi/Renderer/ProbeReflections.h>
 #include <AnKi/Renderer/Dbg.h>
-#include <AnKi/Renderer/Drawer.h>
+#include <AnKi/Renderer/Utils/Drawer.h>
 #include <AnKi/Renderer/UiStage.h>
 #include <AnKi/Renderer/Tonemapping.h>
 #include <AnKi/Renderer/RendererObject.h>

AnKi/Renderer/Dbg.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <AnKi/Renderer/RendererObject.h>
-#include <AnKi/Renderer/DebugDrawer.h>
+#include <AnKi/Renderer/Utils/DebugDrawer.h>
 #include <AnKi/Gr.h>
 #include <AnKi/Util/Enum.h>
 #include <AnKi/Renderer/RenderQueue.h>

AnKi/Renderer/GBuffer.cpp

@@ -227,8 +227,8 @@ void GBuffer::populateRenderGraph(RenderingContext& ctx)
 	pass.newBufferDependency(visOut.m_mdiDrawCountsHandle, BufferUsageBit::kIndirectDraw);
 
 	// HZB generation for the next frame
-	getRenderer().getHzbHelper().populateRenderGraph(m_runCtx.m_crntFrameDepthRt, getRenderer().getInternalResolution(), m_runCtx.m_hzbRt,
-													 UVec2(m_hzbRt->getWidth(), m_hzbRt->getHeight()), rgraph);
+	getRenderer().getHzbGenerator().populateRenderGraph(m_runCtx.m_crntFrameDepthRt, getRenderer().getInternalResolution(), m_runCtx.m_hzbRt,
+														UVec2(m_hzbRt->getWidth(), m_hzbRt->getHeight()), rgraph);
 }
 
 } // end namespace anki

AnKi/Renderer/IndirectDiffuseProbes.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <AnKi/Renderer/RendererObject.h>
-#include <AnKi/Renderer/TraditionalDeferredShading.h>
+#include <AnKi/Renderer/Utils/TraditionalDeferredShading.h>
 #include <AnKi/Renderer/RenderQueue.h>
 #include <AnKi/Collision/Forward.h>
 

AnKi/Renderer/ProbeReflections.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <AnKi/Renderer/RendererObject.h>
-#include <AnKi/Renderer/TraditionalDeferredShading.h>
+#include <AnKi/Renderer/Utils/TraditionalDeferredShading.h>
 #include <AnKi/Resource/ImageResource.h>
 
 namespace anki {

AnKi/Renderer/Renderer.cpp

@@ -291,7 +291,7 @@ Error Renderer::initInternal(UVec2 swapchainResolution)
 	}
 
 	ANKI_CHECK(m_visibility.init());
-	ANKI_CHECK(m_hzbHelper.init());
+	ANKI_CHECK(m_hzbGenerator.init());
 
 	return Error::kNone;
 }

AnKi/Renderer/Renderer.h

@@ -6,14 +6,14 @@
 #pragma once
 
 #include <AnKi/Renderer/Common.h>
-#include <AnKi/Renderer/Drawer.h>
-#include <AnKi/Renderer/GpuVisibilityHelpers.h>
-#include <AnKi/Renderer/HzbHelper.h>
+#include <AnKi/Renderer/Utils/Drawer.h>
+#include <AnKi/Renderer/Utils/GpuVisibility.h>
+#include <AnKi/Renderer/Utils/HzbGenerator.h>
 #include <AnKi/Math.h>
 #include <AnKi/Gr.h>
 #include <AnKi/Resource/Forward.h>
 #include <AnKi/Collision/Forward.h>
-#include <AnKi/Renderer/Readback.h>
+#include <AnKi/Renderer/Utils/Readback.h>
 
 namespace anki {
 
@@ -96,9 +96,9 @@ public:
 		return m_visibility;
 	}
 
-	const HzbHelper& getHzbHelper() const
+	const HzbGenerator& getHzbGenerator() const
 	{
-		return m_hzbHelper;
+		return m_hzbGenerator;
 	}
 
 	ReadbackManager& getReadbackManager()
@@ -200,7 +200,7 @@ private:
 
 	RenderableDrawer m_sceneDrawer;
 	GpuVisibility m_visibility;
-	HzbHelper m_hzbHelper;
+	HzbGenerator m_hzbGenerator;
 	ReadbackManager m_readbaks;
 
 	U64 m_frameCount; ///< Frame number

AnKi/Renderer/ShadowMapping.cpp

@@ -311,7 +311,7 @@ void ShadowMapping::processLights(RenderingContext& ctx)
 				dstViewProjectionMats[cascade] = ctx.m_renderQueue->m_directionalLight.m_shadowRenderQueues[cascade]->m_viewProjectionMatrix;
 			}
 
-			getRenderer().getHzbHelper().populateRenderGraphDirectionalLight(
+			getRenderer().getHzbGenerator().populateRenderGraphDirectionalLight(
 				getRenderer().getGBuffer().getDepthRt(), getRenderer().getInternalResolution(), {hzbRts.getBegin(), light.m_shadowCascadeCount},
 				{dstViewProjectionMats.getBegin(), light.m_shadowCascadeCount}, {hzbSizes.getBegin(), light.m_shadowCascadeCount},
 				ctx.m_matrices.m_invertedViewProjection, rgraph);

AnKi/Renderer/ShadowMapping.h

@@ -8,7 +8,7 @@
 #include <AnKi/Renderer/RendererObject.h>
 #include <AnKi/Gr.h>
 #include <AnKi/Resource/ImageResource.h>
-#include <AnKi/Renderer/TileAllocator.h>
+#include <AnKi/Renderer/Utils/TileAllocator.h>
 
 namespace anki {
 

AnKi/Renderer/DebugDrawer.cpp → AnKi/Renderer/Utils/DebugDrawer.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <AnKi/Renderer/DebugDrawer.h>
+#include <AnKi/Renderer/Utils/DebugDrawer.h>
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Renderer/RenderQueue.h>
 #include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>

AnKi/Renderer/Drawer.cpp → AnKi/Renderer/Utils/Drawer.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <AnKi/Renderer/Drawer.h>
+#include <AnKi/Renderer/Utils/Drawer.h>
 #include <AnKi/Renderer/RenderQueue.h>
 #include <AnKi/Resource/ImageResource.h>
 #include <AnKi/Renderer/Renderer.h>

AnKi/Renderer/Drawer.h → AnKi/Renderer/Utils/Drawer.h

@@ -7,7 +7,7 @@
 
 #include <AnKi/Renderer/Common.h>
 #include <AnKi/Resource/RenderingKey.h>
-#include <AnKi/Renderer/GpuVisibilityHelpers.h>
+#include <AnKi/Renderer/Utils/GpuVisibility.h>
 #include <AnKi/Gr.h>
 
 namespace anki {

AnKi/Renderer/GpuVisibilityHelpers.cpp → AnKi/Renderer/Utils/GpuVisibility.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <AnKi/Renderer/GpuVisibilityHelpers.h>
+#include <AnKi/Renderer/Utils/GpuVisibility.h>
 #include <AnKi/Renderer/Renderer.h>
 #include <AnKi/Scene/RenderStateBucket.h>
 #include <AnKi/Scene/ContiguousArrayAllocator.h>

AnKi/Renderer/GpuVisibilityHelpers.h → AnKi/Renderer/Utils/GpuVisibility.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include <AnKi/Renderer/RendererObject.h>
-#include <AnKi/Renderer/Readback.h>
+#include <AnKi/Renderer/Utils/Readback.h>
 #include <AnKi/Resource/RenderingKey.h>
 
 namespace anki {

AnKi/Renderer/HzbHelper.cpp → AnKi/Renderer/Utils/HzbGenerator.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <AnKi/Renderer/HzbHelper.h>
+#include <AnKi/Renderer/Utils/HzbGenerator.h>
 #include <AnKi/Renderer/Renderer.h>
 
 #if ANKI_COMPILER_GCC_COMPATIBLE
@@ -33,7 +33,7 @@ namespace anki {
 // 0 +----+  1
 static constexpr U16 kBoxIndices[] = {1, 5, 2, 2, 5, 6, 0, 3, 4, 4, 3, 7, 3, 2, 7, 7, 2, 6, 0, 4, 1, 1, 4, 5, 0, 1, 3, 3, 1, 2, 4, 7, 5, 5, 7, 6};
 
-Error HzbHelper::init()
+Error HzbGenerator::init()
 {
 	if(GrManager::getSingleton().getDeviceCapabilities().m_samplingFilterMinMax)
 	{
@@ -101,8 +101,8 @@ Error HzbHelper::init()
 	return Error::kNone;
 }
 
-void HzbHelper::populateRenderGraphInternal(RenderTargetHandle srcDepthRt, UVec2 srcDepthRtSize, RenderTargetHandle dstHzbRt, UVec2 dstHzbRtSize,
-											RenderGraphDescription& rgraph, CString customName, ShaderProgram* prog, Sampler* sampler) const
+void HzbGenerator::populateRenderGraphInternal(RenderTargetHandle srcDepthRt, UVec2 srcDepthRtSize, RenderTargetHandle dstHzbRt, UVec2 dstHzbRtSize,
+											   RenderGraphDescription& rgraph, CString customName, ShaderProgram* prog, Sampler* sampler) const
 {
 	TextureSubresourceInfo firstMipSubresource;
 
@@ -162,16 +162,17 @@ void HzbHelper::populateRenderGraphInternal(RenderTargetHandle srcDepthRt, UVec2
 	});
 }
 
-void HzbHelper::populateRenderGraph(RenderTargetHandle srcDepthRt, UVec2 srcDepthRtSize, RenderTargetHandle dstHzbRt, UVec2 dstHzbRtSize,
-									RenderGraphDescription& rgraph, CString customName) const
+void HzbGenerator::populateRenderGraph(RenderTargetHandle srcDepthRt, UVec2 srcDepthRtSize, RenderTargetHandle dstHzbRt, UVec2 dstHzbRtSize,
+									   RenderGraphDescription& rgraph, CString customName) const
 {
 	populateRenderGraphInternal(srcDepthRt, srcDepthRtSize, dstHzbRt, dstHzbRtSize, rgraph, customName, m_genPyramidMainCameraGrProg.get(),
 								m_maxSampler.isCreated() ? m_maxSampler.get() : getRenderer().getSamplers().m_trilinearClamp.get());
 }
 
-void HzbHelper::populateRenderGraphDirectionalLight(RenderTargetHandle srcDepthRt, UVec2 srcDepthRtSize, ConstWeakArray<RenderTargetHandle> dstHzbRts,
-													ConstWeakArray<Mat4> dstViewProjectionMats, ConstWeakArray<UVec2> dstHzbSizes,
-													const Mat4& invViewProjMat, RenderGraphDescription& rgraph) const
+void HzbGenerator::populateRenderGraphDirectionalLight(RenderTargetHandle srcDepthRt, UVec2 srcDepthRtSize,
+													   ConstWeakArray<RenderTargetHandle> dstHzbRts, ConstWeakArray<Mat4> dstViewProjectionMats,
+													   ConstWeakArray<UVec2> dstHzbSizes, const Mat4& invViewProjMat,
+													   RenderGraphDescription& rgraph) const
 {
 	RenderTargetHandle minMaxRt;
 	constexpr U32 kTileSize = 64;

AnKi/Renderer/HzbHelper.h → AnKi/Renderer/Utils/HzbGenerator.h

@@ -13,7 +13,7 @@ namespace anki {
 /// @{
 
 /// Hierarchical depth generator.
-class HzbHelper : public RendererObject
+class HzbGenerator : public RendererObject
 {
 public:
 	Error init();

AnKi/Renderer/Readback.cpp → AnKi/Renderer/Utils/Readback.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <AnKi/Renderer/Readback.h>
+#include <AnKi/Renderer/Utils/Readback.h>
 
 namespace anki {
 

AnKi/Renderer/TileAllocator.cpp → AnKi/Renderer/Utils/TileAllocator.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <AnKi/Renderer/TileAllocator.h>
+#include <AnKi/Renderer/Utils/TileAllocator.h>
 
 namespace anki {
 

AnKi/Renderer/TileAllocator2.cpp → AnKi/Renderer/Utils/TileAllocator2.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <AnKi/Renderer/TileAllocator2.h>
+#include <AnKi/Renderer/Utils/TileAllocator2.h>
 
 namespace anki {
 

AnKi/Renderer/TraditionalDeferredShading.cpp → AnKi/Renderer/Utils/TraditionalDeferredShading.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <AnKi/Renderer/TraditionalDeferredShading.h>
+#include <AnKi/Renderer/Utils/TraditionalDeferredShading.h>
 #include <AnKi/Renderer/Renderer.h>
 #include <AnKi/Renderer/RenderQueue.h>
 #include <AnKi/Resource/ResourceManager.h>

Tests/Renderer/TileAllocator.cpp

@@ -4,7 +4,7 @@
 // http://www.anki3d.org/LICENSE
 
 #include <Tests/Framework/Framework.h>
-#include <AnKi/Renderer/TileAllocator2.h>
+#include <AnKi/Renderer/Utils/TileAllocator2.h>
 
 ANKI_TEST(Renderer, TileAllocator)
 {