Some renaming

AnKi/Renderer.h

@@ -22,7 +22,7 @@
 #include <AnKi/Renderer/UiStage.h>
 #include <AnKi/Renderer/Tonemapping.h>
 #include <AnKi/Renderer/RendererObject.h>
-#include <AnKi/Renderer/Bloom2.h>
+#include <AnKi/Renderer/Bloom.h>
 #include <AnKi/Renderer/VolumetricLightingAccumulation.h>
 #include <AnKi/Renderer/IndirectDiffuseProbes.h>
 #include <AnKi/Renderer/ShadowmapsResolve.h>

AnKi/Renderer/Bloom2.cpp → AnKi/Renderer/Bloom.cpp

@@ -3,14 +3,14 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <AnKi/Renderer/Bloom2.h>
+#include <AnKi/Renderer/Bloom.h>
 #include <AnKi/Renderer/Renderer.h>
 #include <AnKi/Renderer/LightShading.h>
 #include <AnKi/Renderer/Tonemapping.h>
 
 namespace anki {
 
-Error Bloom2::init()
+Error Bloom::init()
 {
 	// Pyramid
 	{
@@ -30,7 +30,7 @@ Error Bloom2::init()
 		m_pyramidTex = getRenderer().createAndClearRenderTarget(texinit, TextureUsageBit::kSrvCompute);
 
 		// Shader programs
-		ANKI_CHECK(loadShaderProgram("ShaderBinaries/Bloom2.ankiprogbin", {}, m_prog, m_downscaleGrProg, "Downscale"));
+		ANKI_CHECK(loadShaderProgram("ShaderBinaries/Bloom.ankiprogbin", {}, m_prog, m_downscaleGrProg, "Downscale"));
 	}
 
 	// Exposure
@@ -44,7 +44,7 @@ Error Bloom2::init()
 		m_exposureRtDesc.bake();
 
 		// init shaders
-		ANKI_CHECK(loadShaderProgram("ShaderBinaries/Bloom2.ankiprogbin", {}, m_prog, m_exposureGrProg, "Exposure"));
+		ANKI_CHECK(loadShaderProgram("ShaderBinaries/Bloom.ankiprogbin", {}, m_prog, m_exposureGrProg, "Exposure"));
 	}
 
 	// Upscale
@@ -56,7 +56,7 @@ Error Bloom2::init()
 		m_finalRtDesc.bake();
 
 		// init shaders
-		ANKI_CHECK(loadShaderProgram("ShaderBinaries/Bloom2.ankiprogbin", {}, m_prog, m_upscaleGrProg, "Upscale"));
+		ANKI_CHECK(loadShaderProgram("ShaderBinaries/Bloom.ankiprogbin", {}, m_prog, m_upscaleGrProg, "Upscale"));
 
 		// Textures
 		ANKI_CHECK(ResourceManager::getSingleton().loadResource("EngineAssets/LensDirt.ankitex", m_lensDirtImg));
@@ -65,13 +65,13 @@ Error Bloom2::init()
 	return Error::kNone;
 }
 
-void Bloom2::importRenderTargets(RenderingContext& ctx)
+void Bloom::importRenderTargets(RenderingContext& ctx)
 {
 	RenderGraphBuilder& rgraph = ctx.m_renderGraphDescr;
 	m_runCtx.m_pyramidRt = rgraph.importRenderTarget(m_pyramidTex.get(), TextureUsageBit::kSrvCompute);
 }
 
-void Bloom2::populateRenderGraph(RenderingContext& ctx)
+void Bloom::populateRenderGraph(RenderingContext& ctx)
 {
 	RenderGraphBuilder& rgraph = ctx.m_renderGraphDescr;
 	const Bool preferCompute = g_preferComputeCVar;

AnKi/Renderer/Bloom2.h → AnKi/Renderer/Bloom.h

@@ -18,7 +18,7 @@ inline NumericCVar<U32> g_bloomPyramidLowLimit("R", "BloomPyramidLowLimit", 32,
 inline NumericCVar<U32> g_bloomUpscaleDivisor("R", "BloomUpscaleDivisor", 4, 1, 1024, "Defines the resolution of the final bloom result");
 
 /// Contains multiple post-process passes that operate on the HDR output.
-class Bloom2 : public RendererObject
+class Bloom : public RendererObject
 {
 public:
 	Error init();

AnKi/Renderer/FinalComposite.cpp

@@ -5,7 +5,7 @@
 
 #include <AnKi/Renderer/FinalComposite.h>
 #include <AnKi/Renderer/Renderer.h>
-#include <AnKi/Renderer/Bloom2.h>
+#include <AnKi/Renderer/Bloom.h>
 #include <AnKi/Renderer/Scale.h>
 #include <AnKi/Renderer/Tonemapping.h>
 #include <AnKi/Renderer/LightShading.h>
@@ -96,7 +96,7 @@ void FinalComposite::populateRenderGraph(RenderingContext& ctx)
 	}
 
 	pass.newTextureDependency(getRenderer().getScale().getTonemappedRt(), TextureUsageBit::kSrvPixel);
-	pass.newTextureDependency(getRenderer().getBloom2().getBloomRt(), TextureUsageBit::kSrvPixel);
+	pass.newTextureDependency(getRenderer().getBloom().getBloomRt(), TextureUsageBit::kSrvPixel);
 	pass.newTextureDependency(getRenderer().getMotionVectors().getMotionVectorsRt(), TextureUsageBit::kSrvPixel);
 	pass.newTextureDependency(getRenderer().getGBuffer().getDepthRt(), TextureUsageBit::kSrvPixel);
 
@@ -147,7 +147,7 @@ void FinalComposite::populateRenderGraph(RenderingContext& ctx)
 
 			rgraphCtx.bindSrv(0, 0, getRenderer().getScale().getTonemappedRt());
 
-			rgraphCtx.bindSrv(1, 0, getRenderer().getBloom2().getBloomRt());
+			rgraphCtx.bindSrv(1, 0, getRenderer().getBloom().getBloomRt());
 			cmdb.bindSrv(2, 0, TextureView(&m_lut->getTexture(), TextureSubresourceDesc::all()));
 			rgraphCtx.bindSrv(3, 0, getRenderer().getMotionVectors().getMotionVectorsRt());
 			rgraphCtx.bindSrv(4, 0, getRenderer().getGBuffer().getDepthRt());

AnKi/Renderer/Renderer.cpp

@@ -23,7 +23,7 @@
 #include <AnKi/Renderer/LightShading.h>
 #include <AnKi/Renderer/ShadowMapping.h>
 #include <AnKi/Renderer/FinalComposite.h>
-#include <AnKi/Renderer/Bloom2.h>
+#include <AnKi/Renderer/Bloom.h>
 #include <AnKi/Renderer/Tonemapping.h>
 #include <AnKi/Renderer/ForwardShading.h>
 #include <AnKi/Renderer/LensFlare.h>

AnKi/Renderer/RendererObject.def.h

@@ -11,7 +11,7 @@ ANKI_RENDERER_OBJECT_DEF(ShadowMapping, shadowMapping, 1)
 ANKI_RENDERER_OBJECT_DEF(LightShading, lightShading, 1)
 ANKI_RENDERER_OBJECT_DEF(ForwardShading, forwardShading, 1)
 ANKI_RENDERER_OBJECT_DEF(LensFlare, lensFlare, 1)
-ANKI_RENDERER_OBJECT_DEF(Bloom2, bloom2, 1)
+ANKI_RENDERER_OBJECT_DEF(Bloom, bloom2, 1)
 ANKI_RENDERER_OBJECT_DEF(Tonemapping, tonemapping, 1)
 ANKI_RENDERER_OBJECT_DEF(FinalComposite, finalComposite, 1)
 ANKI_RENDERER_OBJECT_DEF(Dbg, dbg, 1)

AnKi/Renderer/Ssr.cpp

@@ -6,7 +6,7 @@
 #include <AnKi/Renderer/Ssr.h>
 #include <AnKi/Renderer/Renderer.h>
 #include <AnKi/Util/Tracer.h>
-#include <AnKi/Renderer/Bloom2.h>
+#include <AnKi/Renderer/Bloom.h>
 #include <AnKi/Renderer/GBuffer.h>
 #include <AnKi/Renderer/DepthDownscale.h>
 
@@ -96,7 +96,7 @@ void Ssr::populateRenderGraph(RenderingContext& ctx)
 		writeUsage = TextureUsageBit::kRtvDsvWrite;
 	}
 
-	ppass->newTextureDependency(getRenderer().getBloom2().getPyramidRt(), readUsage);
+	ppass->newTextureDependency(getRenderer().getBloom().getPyramidRt(), readUsage);
 	ppass->newTextureDependency(getRenderer().getGBuffer().getColorRt(1), readUsage);
 	ppass->newTextureDependency(getRenderer().getGBuffer().getColorRt(2), readUsage);
 	ppass->newTextureDependency(getRenderer().getDepthDownscale().getRt(), readUsage);
@@ -126,7 +126,7 @@ void Ssr::populateRenderGraph(RenderingContext& ctx)
 		rgraphCtx.bindSrv(0, 0, getRenderer().getGBuffer().getColorRt(1));
 		rgraphCtx.bindSrv(1, 0, getRenderer().getGBuffer().getColorRt(2));
 		rgraphCtx.bindSrv(2, 0, getRenderer().getDepthDownscale().getRt());
-		rgraphCtx.bindSrv(3, 0, getRenderer().getBloom2().getPyramidRt());
+		rgraphCtx.bindSrv(3, 0, getRenderer().getBloom().getPyramidRt());
 
 		if(g_preferComputeCVar)
 		{

AnKi/Renderer/Tonemapping.cpp

@@ -4,7 +4,7 @@
 // http://www.anki3d.org/LICENSE
 
 #include <AnKi/Renderer/Tonemapping.h>
-#include <AnKi/Renderer/Bloom2.h>
+#include <AnKi/Renderer/Bloom.h>
 #include <AnKi/Renderer/Renderer.h>
 #include <AnKi/Util/Tracer.h>
 
@@ -23,8 +23,8 @@ Error Tonemapping::init()
 
 Error Tonemapping::initInternal()
 {
-	m_inputTexMip = (getRenderer().getBloom2().getPyramidTextureMipmapCount() > 2) ? getRenderer().getBloom2().getPyramidTextureMipmapCount() - 2 : 0;
-	const UVec2 size = getRenderer().getBloom2().getPyramidTextureSize() >> m_inputTexMip;
+	m_inputTexMip = (getRenderer().getBloom().getPyramidTextureMipmapCount() > 2) ? getRenderer().getBloom().getPyramidTextureMipmapCount() - 2 : 0;
+	const UVec2 size = getRenderer().getBloom().getPyramidTextureSize() >> m_inputTexMip;
 
 	ANKI_R_LOGV("Initializing tonemapping. Resolution %ux%u", size.x(), size.y());
 
@@ -62,12 +62,12 @@ void Tonemapping::populateRenderGraph(RenderingContext& ctx)
 
 		cmdb.bindShaderProgram(m_grProg.get());
 		rgraphCtx.bindUav(0, 0, m_runCtx.m_exposureLuminanceHandle);
-		rgraphCtx.bindSrv(0, 0, getRenderer().getBloom2().getPyramidRt(), TextureSubresourceDesc::surface(m_inputTexMip, 0, 0));
+		rgraphCtx.bindSrv(0, 0, getRenderer().getBloom().getPyramidRt(), TextureSubresourceDesc::surface(m_inputTexMip, 0, 0));
 
 		cmdb.dispatchCompute(1, 1, 1);
 	});
 
-	pass.newTextureDependency(getRenderer().getBloom2().getPyramidRt(), TextureUsageBit::kSrvCompute,
+	pass.newTextureDependency(getRenderer().getBloom().getPyramidRt(), TextureUsageBit::kSrvCompute,
 							  TextureSubresourceDesc::surface(m_inputTexMip, 0, 0));
 }