Enable FSR

AnKi/Renderer/ConfigDefs.h

@@ -55,3 +55,5 @@ ANKI_CONFIG_OPTION(r_smResolveFactor, 0.5, 0.25, 1.0)
 ANKI_CONFIG_OPTION(r_rtShadowsSvgf, 0, 0, 1)
 ANKI_CONFIG_OPTION(r_rtShadowsSvgfAtrousPassCount, 3, 1, 20)
 ANKI_CONFIG_OPTION(r_rtShadowsRaysPerPixel, 1, 1, 8)
+
+ANKI_CONFIG_OPTION(r_fsr, 1, 0, 1)

AnKi/Renderer/Scale.cpp

@@ -8,6 +8,18 @@
 #include <AnKi/Renderer/TemporalAA.h>
 #include <AnKi/Core/ConfigSet.h>
 
+#if ANKI_COMPILER_GCC_COMPATIBLE
+#	pragma GCC diagnostic push
+#	pragma GCC diagnostic ignored "-Wunused-function"
+#	pragma GCC diagnostic ignored "-Wignored-qualifiers"
+#endif
+#define A_CPU
+#include <ThirdParty/Fsr/ffx_a.h>
+#include <ThirdParty/Fsr/ffx_fsr1.h>
+#if ANKI_COMPILER_GCC_COMPATIBLE
+#	pragma GCC diagnostic pop
+#endif
+
 namespace anki
 {
 
@@ -25,11 +37,14 @@ Error Scale::init(const ConfigSet& cfg)
 
 	ANKI_R_LOGI("Initializing (up|down)scale pass");
 
+	m_fsr = cfg.getBool("r_fsr");
+
 	// Program
-	ANKI_CHECK(getResourceManager().loadResource("Shaders/Blit.ankiprog", m_blitProg));
+	ANKI_CHECK(
+		getResourceManager().loadResource((m_fsr) ? "Shaders/Fsr.ankiprog" : "Shaders/BlitCompute.ankiprog", m_prog));
 	const ShaderProgramResourceVariant* variant;
-	m_blitProg->getOrCreateVariant(variant);
-	m_blitGrProg = variant->getProgram();
+	m_prog->getOrCreateVariant(variant);
+	m_grProg = variant->getProgram();
 
 	// The RT desc
 	m_rtDesc =
@@ -37,17 +52,12 @@ Error Scale::init(const ConfigSet& cfg)
 											 LIGHT_SHADING_COLOR_ATTACHMENT_PIXEL_FORMAT, "Scaled");
 	m_rtDesc.bake();
 
-	// FB descr
-	m_fbDescr.m_colorAttachmentCount = 1;
-	m_fbDescr.m_colorAttachments[0].m_loadOperation = AttachmentLoadOperation::DONT_CARE;
-	m_fbDescr.bake();
-
 	return Error::NONE;
 }
 
 void Scale::populateRenderGraph(RenderingContext& ctx)
 {
-	const Bool needsScale = m_blitGrProg.isCreated();
+	const Bool needsScale = m_grProg.isCreated();
 	if(!needsScale)
 	{
 		m_runCtx.m_upscaledRt = m_r->getTemporalAA().getRt();
@@ -58,11 +68,9 @@ void Scale::populateRenderGraph(RenderingContext& ctx)
 
 		m_runCtx.m_upscaledRt = rgraph.newRenderTarget(m_rtDesc);
 
-		GraphicsRenderPassDescription& pass = ctx.m_renderGraphDescr.newGraphicsRenderPass("Scale");
-		pass.newDependency(RenderPassDependency(m_r->getTemporalAA().getRt(), TextureUsageBit::SAMPLED_FRAGMENT));
-		pass.newDependency(RenderPassDependency(m_runCtx.m_upscaledRt, TextureUsageBit::FRAMEBUFFER_ATTACHMENT_WRITE));
-
-		pass.setFramebufferInfo(m_fbDescr, {{m_runCtx.m_upscaledRt}}, {});
+		ComputeRenderPassDescription& pass = ctx.m_renderGraphDescr.newComputeRenderPass("Scale");
+		pass.newDependency(RenderPassDependency(m_r->getTemporalAA().getRt(), TextureUsageBit::SAMPLED_COMPUTE));
+		pass.newDependency(RenderPassDependency(m_runCtx.m_upscaledRt, TextureUsageBit::IMAGE_COMPUTE_WRITE));
 
 		pass.setWork(
 			[](RenderPassWorkContext& rgraphCtx) {
@@ -77,14 +85,49 @@ void Scale::run(RenderPassWorkContext& rgraphCtx)
 {
 	CommandBufferPtr& cmdb = rgraphCtx.m_commandBuffer;
 
-	cmdb->bindShaderProgram(m_blitGrProg);
-
-	cmdb->setViewport(0, 0, m_r->getPostProcessResolution().x(), m_r->getPostProcessResolution().y());
+	cmdb->bindShaderProgram(m_grProg);
 
 	cmdb->bindSampler(0, 0, m_r->getSamplers().m_trilinearClamp);
 	rgraphCtx.bindColorTexture(0, 1, m_r->getTemporalAA().getRt());
+	rgraphCtx.bindImage(0, 2, m_runCtx.m_upscaledRt);
+
+	if(m_fsr)
+	{
+		class
+		{
+		public:
+			UVec4 m_fsrConsts0;
+			UVec4 m_fsrConsts1;
+			UVec4 m_fsrConsts2;
+			UVec4 m_fsrConsts3;
+			UVec2 m_viewportSize;
+			UVec2 m_padding;
+		} pc;
+
+		const Vec2 inRez(m_r->getInternalResolution());
+		const Vec2 outRez(m_r->getPostProcessResolution());
+		FsrEasuCon(&pc.m_fsrConsts0[0], &pc.m_fsrConsts1[0], &pc.m_fsrConsts2[0], &pc.m_fsrConsts3[0], inRez.x(),
+				   inRez.y(), inRez.x(), inRez.y(), outRez.x(), outRez.y());
+
+		pc.m_viewportSize = m_r->getPostProcessResolution();
+
+		cmdb->setPushConstants(&pc, sizeof(pc));
+	}
+	else
+	{
+		class
+		{
+		public:
+			Vec2 m_viewportSize;
+			UVec2 m_viewportSizeU;
+		} pc;
+		pc.m_viewportSize = Vec2(m_r->getPostProcessResolution());
+		pc.m_viewportSizeU = m_r->getPostProcessResolution();
+
+		cmdb->setPushConstants(&pc, sizeof(pc));
+	}
 
-	cmdb->drawArrays(PrimitiveTopology::TRIANGLES, 3, 1);
+	dispatchPPCompute(cmdb, 8, 8, m_r->getPostProcessResolution().x(), m_r->getPostProcessResolution().y());
 }
 
 } // end namespace anki

AnKi/Renderer/Scale.h

@@ -34,11 +34,12 @@ public:
 	}
 
 private:
-	ShaderProgramResourcePtr m_blitProg;
-	ShaderProgramPtr m_blitGrProg;
+	ShaderProgramResourcePtr m_prog;
+	ShaderProgramPtr m_grProg;
 
 	RenderTargetDescription m_rtDesc;
-	FramebufferDescription m_fbDescr;
+
+	Bool m_fsr = false;
 
 	class
 	{

AnKi/Shaders/Blit.glsl

@@ -17,7 +17,7 @@ layout(set = 0, binding = 1) uniform texture2D u_tex;
 #if USE_COMPUTE
 layout(set = 0, binding = 2) uniform writeonly image2D u_outImage;
 
-layout(push_constant, std140) uniform b_pc
+layout(push_constant, std430) uniform b_pc
 {
 	Vec2 u_viewportSize;
 	UVec2 u_viewportSizeU;
@@ -37,7 +37,7 @@ void main()
 		return;
 	}
 
-	const Vec2 uv = (Vec2(gl_GlobalInvocationID.xy) + 0.5) / Vec2(u_viewportSize);
+	const Vec2 uv = (Vec2(gl_GlobalInvocationID.xy) + 0.5) / u_viewportSize;
 #else
 	const Vec2 uv = in_uv;
 #endif

AnKi/Shaders/Fsr.ankiprog

@@ -11,12 +11,14 @@ layout(set = 0, binding = 0) uniform sampler u_linearAnyClampSampler;
 layout(set = 0, binding = 1) uniform texture2D u_tex;
 layout(set = 0, binding = 2) writeonly uniform image2D u_outImg;
 
-layout(push_constant) uniform b_pc
+layout(push_constant, std430) uniform b_pc
 {
 	UVec4 u_fsrConsts0;
 	UVec4 u_fsrConsts1;
 	UVec4 u_fsrConsts2;
 	UVec4 u_fsrConsts3;
+	UVec2 u_viewportSize;
+	UVec2 u_padding;
 };
 
 // FSR begin
@@ -48,7 +50,7 @@ layout(local_size_x = 8, local_size_y = 8) in;
 
 void main()
 {
-	if(skipOutOfBoundsInvocations(UVec2(8u), gl_GlobalInvocationID.xy))
+	if(skipOutOfBoundsInvocations(UVec2(8u), u_viewportSize))
 	{
 		return;
 	}