Change the order and the input of VRS SRI generation

AnKi/Renderer/Renderer.cpp

@@ -333,6 +333,7 @@ Error Renderer::populateRenderGraph(RenderingContext& ctx)
 	m_downscaleBlur->importRenderTargets(ctx);
 	m_tonemapping->importRenderTargets(ctx);
 	m_depthDownscale->importRenderTargets(ctx);
+	m_vrsSriGeneration->importRenderTargets(ctx);
 
 	// Populate render graph. WARNING Watch the order
 	m_genericCompute->populateRenderGraph(ctx);
@@ -341,7 +342,6 @@ Error Renderer::populateRenderGraph(RenderingContext& ctx)
 	{
 		m_accelerationStructureBuilder->populateRenderGraph(ctx);
 	}
-	m_vrsSriGeneration->populateRenderGraph(ctx);
 	m_shadowMapping->populateRenderGraph(ctx);
 	m_indirectDiffuseProbes->populateRenderGraph(ctx);
 	m_probeReflections->populateRenderGraph(ctx);
@@ -364,6 +364,7 @@ Error Renderer::populateRenderGraph(RenderingContext& ctx)
 	m_indirectDiffuse->populateRenderGraph(ctx);
 	m_lightShading->populateRenderGraph(ctx);
 	m_temporalAA->populateRenderGraph(ctx);
+	m_vrsSriGeneration->populateRenderGraph(ctx);
 	m_scale->populateRenderGraph(ctx);
 	m_downscaleBlur->populateRenderGraph(ctx);
 	m_tonemapping->populateRenderGraph(ctx);

AnKi/Renderer/VrsSriGeneration.cpp

@@ -5,7 +5,7 @@
 
 #include <AnKi/Renderer/VrsSriGeneration.h>
 #include <AnKi/Renderer/Renderer.h>
-#include <AnKi/Renderer/DownscaleBlur.h>
+#include <AnKi/Renderer/TemporalAA.h>
 #include <AnKi/Core/ConfigSet.h>
 
 namespace anki {
@@ -36,18 +36,22 @@ Error VrsSriGeneration::initInternal()
 
 	ANKI_R_LOGV("Intializing VRS SRI generation. SRI resolution %ux%u", rez.x(), rez.y());
 
-	// Bake descriptors
-	m_rtDescr = m_r->create2DRenderTargetDescription(rez.x(), rez.y(), Format::R8_UINT, "VRS SRI");
-	m_rtDescr.bake();
+	// SRI
+	const TextureUsageBit texUsage = TextureUsageBit::FRAMEBUFFER_SHADING_RATE | TextureUsageBit::IMAGE_COMPUTE_WRITE
+									 | TextureUsageBit::SAMPLED_FRAGMENT;
+	TextureInitInfo sriInitInfo =
+		m_r->create2DRenderTargetInitInfo(rez.x(), rez.y(), Format::R8_UINT, texUsage, "VRS SRI");
+	sriInitInfo.m_initialUsage = TextureUsageBit::FRAMEBUFFER_SHADING_RATE;
+	m_sriTex = m_r->createAndClearRenderTarget(sriInitInfo);
 
+	// Descr
 	m_fbDescr.m_colorAttachmentCount = 1;
 	m_fbDescr.bake();
 
 	// Load programs
 	ANKI_CHECK(getResourceManager().loadResource("AnKi/Shaders/VrsSriGenerationCompute.ankiprog", m_prog));
 	ShaderProgramResourceVariantInitInfo variantInit(m_prog);
-	// SRI_TEXEL_DIMENSION is half because the input image is quarter resolution
-	variantInit.addMutation("SRI_TEXEL_DIMENSION", m_sriTexelDimension / 2u);
+	variantInit.addMutation("SRI_TEXEL_DIMENSION", m_sriTexelDimension);
 	const ShaderProgramResourceVariant* variant;
 	m_prog->getOrCreateVariant(variantInit, variant);
 	m_grProg = variant->getProgram();
@@ -67,6 +71,25 @@ void VrsSriGeneration::getDebugRenderTarget(CString rtName, RenderTargetHandle&
 	optionalShaderProgram = m_visualizeGrProg;
 }
 
+void VrsSriGeneration::importRenderTargets(RenderingContext& ctx)
+{
+	const Bool enableVrs = getGrManager().getDeviceCapabilities().m_vrs && getConfig().getRVrs();
+	if(!enableVrs)
+	{
+		return;
+	}
+
+	if(m_sriTexImportedOnce)
+	{
+		m_runCtx.m_rt = ctx.m_renderGraphDescr.importRenderTarget(m_sriTex);
+	}
+	else
+	{
+		m_runCtx.m_rt = ctx.m_renderGraphDescr.importRenderTarget(m_sriTex, TextureUsageBit::FRAMEBUFFER_SHADING_RATE);
+		m_sriTexImportedOnce = true;
+	}
+}
+
 void VrsSriGeneration::populateRenderGraph(RenderingContext& ctx)
 {
 	const Bool enableVrs = getGrManager().getDeviceCapabilities().m_vrs && getConfig().getRVrs();
@@ -76,24 +99,23 @@ void VrsSriGeneration::populateRenderGraph(RenderingContext& ctx)
 	}
 
 	RenderGraphDescription& rgraph = ctx.m_renderGraphDescr;
-	m_runCtx.m_rt = rgraph.newRenderTarget(m_rtDescr);
 
 	ComputeRenderPassDescription& pass = rgraph.newComputeRenderPass("VRS SRI generation");
 
 	pass.newDependency(RenderPassDependency(m_runCtx.m_rt, TextureUsageBit::IMAGE_COMPUTE_WRITE));
-	pass.newDependency(RenderPassDependency(m_r->getDownscaleBlur().getRt(), TextureUsageBit::SAMPLED_COMPUTE));
+	pass.newDependency(RenderPassDependency(m_r->getTemporalAA().getTonemappedRt(), TextureUsageBit::SAMPLED_COMPUTE));
 
 	pass.setWork([this](RenderPassWorkContext& rgraphCtx) {
 		CommandBufferPtr& cmdb = rgraphCtx.m_commandBuffer;
 
 		cmdb->bindShaderProgram(m_grProg);
 
-		rgraphCtx.bindColorTexture(0, 0, m_r->getDownscaleBlur().getRt());
+		rgraphCtx.bindColorTexture(0, 0, m_r->getTemporalAA().getTonemappedRt());
 		rgraphCtx.bindImage(0, 1, m_runCtx.m_rt);
 
-		const U32 workgroupSize = m_sriTexelDimension / 2u;
-		dispatchPPCompute(cmdb, workgroupSize, workgroupSize, m_r->getInternalResolution().x() / 2,
-						  m_r->getInternalResolution().y() / 2);
+		const U32 workgroupSize = m_sriTexelDimension;
+		dispatchPPCompute(cmdb, workgroupSize, workgroupSize, m_r->getInternalResolution().x(),
+						  m_r->getInternalResolution().y());
 	});
 }
 

AnKi/Renderer/VrsSriGeneration.h

@@ -21,6 +21,8 @@ public:
 
 	ANKI_USE_RESULT Error init();
 
+	void importRenderTargets(RenderingContext& ctx);
+
 	/// Populate the rendergraph.
 	void populateRenderGraph(RenderingContext& ctx);
 
@@ -41,7 +43,8 @@ public:
 	ShaderProgramResourcePtr m_visualizeProg;
 	ShaderProgramPtr m_visualizeGrProg;
 
-	RenderTargetDescription m_rtDescr;
+	TexturePtr m_sriTex;
+	Bool m_sriTexImportedOnce = false;
 	FramebufferDescription m_fbDescr;
 
 	static constexpr U32 m_sriTexelDimension = 16;

AnKi/Shaders/VrsSriGeneration.glsl

@@ -25,7 +25,7 @@ shared F32 s_lumaMax[WORKGROUP_SIZE.y * WORKGROUP_SIZE.x];
 void main()
 {
 	// Get luminance
-	const Vec3 color = invertibleTonemap(texelFetch(u_inputTex, IVec2(gl_GlobalInvocationID.xy), 0).xyz);
+	const Vec3 color = texelFetch(u_inputTex, IVec2(gl_GlobalInvocationID.xy), 0).xyz;
 	const F32 luma = computeLuminance(color);
 
 	// Store luminance