Browse Source

Remove some unneeded parameters

Panagiotis Christopoulos Charitos 7 years ago
parent
commit
ddcc00bad3

+ 4 - 4
src/anki/gr/RenderGraph.h

@@ -500,13 +500,13 @@ public:
 	}
 
 	/// Import an existing render target.
-	RenderTargetHandle importRenderTarget(CString name, TexturePtr tex, TextureUsageBit usage)
+	RenderTargetHandle importRenderTarget(TexturePtr tex, TextureUsageBit usage)
 	{
 		RT& rt = *m_renderTargets.emplaceBack(m_alloc);
 		rt.m_importedTex = tex;
 		rt.m_importedLastKnownUsage = usage;
 		rt.m_usageDerivedByDeps = TextureUsageBit::NONE;
-		rt.setName(name);
+		rt.setName(tex->getName());
 
 		RenderTargetHandle out;
 		out.m_idx = m_renderTargets.getSize() - 1;
@@ -532,10 +532,10 @@ public:
 	}
 
 	/// Import a buffer.
-	RenderPassBufferHandle importBuffer(CString name, BufferPtr buff, BufferUsageBit usage)
+	RenderPassBufferHandle importBuffer(BufferPtr buff, BufferUsageBit usage)
 	{
 		Buffer& b = *m_buffers.emplaceBack(m_alloc);
-		b.setName(name);
+		b.setName(buff->getName());
 		b.m_usage = usage;
 		b.m_importedBuff = buff;
 

+ 1 - 1
src/anki/gr/ShaderCompiler.cpp

@@ -249,7 +249,7 @@ static ANKI_USE_RESULT Error genSpirv(const ShaderCompiler::BuildContext& ctx, s
 	// Gen SPIRV
 	glslang::SpvOptions spvOptions;
 	spvOptions.optimizeSize = true;
-	spvOptions.disableOptimizer = true; // Enabling it crashes RADV
+	spvOptions.disableOptimizer = false;
 	glslang::GlslangToSpv(*program.getIntermediate(stage), spirv, &spvOptions);
 
 	return Error::NONE;

+ 1 - 1
src/anki/renderer/DownscaleBlur.cpp

@@ -85,7 +85,7 @@ Error DownscaleBlur::initInternal(const ConfigSet&)
 void DownscaleBlur::importRenderTargets(RenderingContext& ctx)
 {
 	RenderGraphDescription& rgraph = ctx.m_renderGraphDescr;
-	m_runCtx.m_rt = rgraph.importRenderTarget("Down/Blur", m_rtTex, TextureUsageBit::SAMPLED_COMPUTE);
+	m_runCtx.m_rt = rgraph.importRenderTarget(m_rtTex, TextureUsageBit::SAMPLED_COMPUTE);
 }
 
 void DownscaleBlur::populateRenderGraph(RenderingContext& ctx)

+ 4 - 7
src/anki/renderer/Indirect.cpp

@@ -624,7 +624,7 @@ void Indirect::populateRenderGraph(RenderingContext& rctx)
 
 			// RT
 			m_ctx.m_lightShadingRt =
-				rgraph.importRenderTarget("GI light", m_lightShading.m_cubeArr, TextureUsageBit::SAMPLED_FRAGMENT);
+				rgraph.importRenderTarget(m_lightShading.m_cubeArr, TextureUsageBit::SAMPLED_FRAGMENT);
 
 			// Passes
 			static const Array<CString, 6> passNames = {{"GI LightShad #0",
@@ -689,8 +689,7 @@ void Indirect::populateRenderGraph(RenderingContext& rctx)
 				runIrradianceCallback<5>}};
 
 			// Rt
-			m_ctx.m_irradianceRt =
-				rgraph.importRenderTarget("GI irradiance", m_irradiance.m_cubeArr, TextureUsageBit::SAMPLED_FRAGMENT);
+			m_ctx.m_irradianceRt = rgraph.importRenderTarget(m_irradiance.m_cubeArr, TextureUsageBit::SAMPLED_FRAGMENT);
 
 			static const Array<CString, 6> passNames = {
 				{"GI Irr/ce #0", "GI Irr/ce #1", "GI Irr/ce #2", "GI Irr/ce #3", "GI Irr/ce #4", "GI Irr/ce #5"}};
@@ -716,10 +715,8 @@ void Indirect::populateRenderGraph(RenderingContext& rctx)
 	{
 		// Just import
 
-		m_ctx.m_lightShadingRt =
-			rgraph.importRenderTarget("GI light", m_lightShading.m_cubeArr, TextureUsageBit::SAMPLED_FRAGMENT);
-		m_ctx.m_irradianceRt =
-			rgraph.importRenderTarget("GI irradiance", m_irradiance.m_cubeArr, TextureUsageBit::SAMPLED_FRAGMENT);
+		m_ctx.m_lightShadingRt = rgraph.importRenderTarget(m_lightShading.m_cubeArr, TextureUsageBit::SAMPLED_FRAGMENT);
+		m_ctx.m_irradianceRt = rgraph.importRenderTarget(m_irradiance.m_cubeArr, TextureUsageBit::SAMPLED_FRAGMENT);
 	}
 }
 

+ 1 - 1
src/anki/renderer/LensFlare.cpp

@@ -131,7 +131,7 @@ void LensFlare::populateRenderGraph(RenderingContext& ctx)
 	RenderGraphDescription& rgraph = ctx.m_renderGraphDescr;
 
 	// Import buffer
-	m_runCtx.m_indirectBuffHandle = rgraph.importBuffer("LensFl Indirect", m_indirectBuff, BufferUsageBit::NONE);
+	m_runCtx.m_indirectBuffHandle = rgraph.importBuffer(m_indirectBuff, BufferUsageBit::NONE);
 
 	// Update the indirect buffer
 	{

+ 2 - 2
src/anki/renderer/ShadowMapping.cpp

@@ -237,7 +237,7 @@ void ShadowMapping::populateRenderGraph(RenderingContext& ctx)
 		{
 			GraphicsRenderPassDescription& pass = rgraph.newGraphicsRenderPass("ESM");
 
-			m_esmRt = rgraph.importRenderTarget("ESM", m_esmAtlas, TextureUsageBit::SAMPLED_FRAGMENT);
+			m_esmRt = rgraph.importRenderTarget(m_esmAtlas, TextureUsageBit::SAMPLED_FRAGMENT);
 			pass.setFramebufferInfo(m_esmFbDescr, {{m_esmRt}}, {});
 			pass.setWork(runEsmCallback, this, 0);
 
@@ -250,7 +250,7 @@ void ShadowMapping::populateRenderGraph(RenderingContext& ctx)
 	else
 	{
 		// No need for shadowmapping passes, just import the ESM atlas
-		m_esmRt = rgraph.importRenderTarget("ESM", m_esmAtlas, TextureUsageBit::SAMPLED_FRAGMENT);
+		m_esmRt = rgraph.importRenderTarget(m_esmAtlas, TextureUsageBit::SAMPLED_FRAGMENT);
 	}
 }
 

+ 3 - 4
src/anki/renderer/TemporalAA.cpp

@@ -97,10 +97,9 @@ void TemporalAA::populateRenderGraph(RenderingContext& ctx)
 	RenderGraphDescription& rgraph = ctx.m_renderGraphDescr;
 
 	// Import RTs
-	m_runCtx.m_historyRt = rgraph.importRenderTarget(
-		"TemporalAA hist", m_rtTextures[(m_r->getFrameCount() + 1) & 1], TextureUsageBit::SAMPLED_FRAGMENT);
-	m_runCtx.m_renderRt =
-		rgraph.importRenderTarget("TemporalAA", m_rtTextures[m_r->getFrameCount() & 1], TextureUsageBit::NONE);
+	m_runCtx.m_historyRt =
+		rgraph.importRenderTarget(m_rtTextures[(m_r->getFrameCount() + 1) & 1], TextureUsageBit::SAMPLED_FRAGMENT);
+	m_runCtx.m_renderRt = rgraph.importRenderTarget(m_rtTextures[m_r->getFrameCount() & 1], TextureUsageBit::NONE);
 
 	// Create pass
 	GraphicsRenderPassDescription& pass = rgraph.newGraphicsRenderPass("TemporalAA");

+ 1 - 1
src/anki/renderer/Tonemapping.cpp

@@ -69,7 +69,7 @@ void Tonemapping::importRenderTargets(RenderingContext& ctx)
 	// Computation of the AVG luminance will run first in the frame and it will use the m_luminanceBuff as storage
 	// read/write. To skip the barrier import it as read/write as well.
 	m_runCtx.m_buffHandle =
-		ctx.m_renderGraphDescr.importBuffer("Avg lum", m_luminanceBuff, BufferUsageBit::STORAGE_COMPUTE_READ_WRITE);
+		ctx.m_renderGraphDescr.importBuffer(m_luminanceBuff, BufferUsageBit::STORAGE_COMPUTE_READ_WRITE);
 }
 
 void Tonemapping::populateRenderGraph(RenderingContext& ctx)

+ 3 - 4
src/anki/renderer/Volumetric.cpp

@@ -88,7 +88,7 @@ Error Volumetric::init(const ConfigSet& config)
 			m_height,
 			LIGHT_SHADING_COLOR_ATTACHMENT_PIXEL_FORMAT,
 			TextureUsageBit::SAMPLED_FRAGMENT | TextureUsageBit::FRAMEBUFFER_ATTACHMENT_WRITE,
-			"volmain");
+			"Volumetric");
 		rtInit.m_initialUsage = TextureUsageBit::SAMPLED_FRAGMENT;
 		m_rtTextures[i] = m_r->createAndClearRenderTarget(rtInit);
 	}
@@ -196,11 +196,10 @@ void Volumetric::populateRenderGraph(RenderingContext& ctx)
 
 	// Create RTs
 	const U rtToRenderIdx = m_r->getFrameCount() & 1;
-	m_runCtx.m_rts[rtToRenderIdx] =
-		rgraph.importRenderTarget("VOL #1", m_rtTextures[rtToRenderIdx], TextureUsageBit::NONE);
+	m_runCtx.m_rts[rtToRenderIdx] = rgraph.importRenderTarget(m_rtTextures[rtToRenderIdx], TextureUsageBit::NONE);
 	const U rtToReadIdx = !rtToRenderIdx;
 	m_runCtx.m_rts[rtToReadIdx] =
-		rgraph.importRenderTarget("VOL #2", m_rtTextures[rtToReadIdx], TextureUsageBit::SAMPLED_FRAGMENT);
+		rgraph.importRenderTarget(m_rtTextures[rtToReadIdx], TextureUsageBit::SAMPLED_FRAGMENT);
 
 	// Create main render pass
 	{

+ 1 - 0
src/anki/util/SparseArray.inl.h

@@ -284,6 +284,7 @@ void SparseArray<T, TIndex>::validate() const
 		if(m_metadata[pos].m_alive)
 		{
 			const Index myDesiredPos = mod(m_metadata[pos].m_idx);
+			(void)myDesiredPos;
 			ANKI_ASSERT(distanceFromDesired(pos, myDesiredPos) < m_probeCount);
 
 			if(prevPos != ~Index(0))

+ 5 - 5
tests/gr/Gr.cpp

@@ -1618,7 +1618,7 @@ ANKI_TEST(Gr, RenderGraph)
 	}
 
 	// SM to exponential SM
-	RenderTargetHandle smExpRt = descr.importRenderTarget("ESM", dummyTex, TextureUsageBit::SAMPLED_FRAGMENT);
+	RenderTargetHandle smExpRt = descr.importRenderTarget(dummyTex, TextureUsageBit::SAMPLED_FRAGMENT);
 	{
 		GraphicsRenderPassDescription& pass = descr.newGraphicsRenderPass("ESM");
 		pass.newConsumer({smScratchRt, TextureUsageBit::SAMPLED_FRAGMENT});
@@ -1642,7 +1642,7 @@ ANKI_TEST(Gr, RenderGraph)
 	}
 
 	// GI light
-	RenderTargetHandle giGiLightRt = descr.importRenderTarget("GI light", dummyTex, TextureUsageBit::SAMPLED_FRAGMENT);
+	RenderTargetHandle giGiLightRt = descr.importRenderTarget(dummyTex, TextureUsageBit::SAMPLED_FRAGMENT);
 	for(U faceIdx = 0; faceIdx < 6; ++faceIdx)
 	{
 		TextureSubresourceInfo subresource(TextureSurfaceInfo(0, 0, faceIdx, 0));
@@ -1762,7 +1762,7 @@ ANKI_TEST(Gr, RenderGraph)
 	}
 
 	// Light shading
-	RenderTargetHandle lightRt = descr.importRenderTarget("Light", dummyTex, TextureUsageBit::NONE);
+	RenderTargetHandle lightRt = descr.importRenderTarget(dummyTex, TextureUsageBit::NONE);
 	{
 		GraphicsRenderPassDescription& pass = descr.newGraphicsRenderPass("Light shading");
 
@@ -1780,8 +1780,8 @@ ANKI_TEST(Gr, RenderGraph)
 	}
 
 	// TAA
-	RenderTargetHandle taaHistoryRt = descr.importRenderTarget("TAA hist", dummyTex, TextureUsageBit::SAMPLED_FRAGMENT);
-	RenderTargetHandle taaRt = descr.importRenderTarget("TAA", dummyTex, TextureUsageBit::NONE);
+	RenderTargetHandle taaHistoryRt = descr.importRenderTarget(dummyTex, TextureUsageBit::SAMPLED_FRAGMENT);
+	RenderTargetHandle taaRt = descr.importRenderTarget(dummyTex, TextureUsageBit::NONE);
 	{
 		GraphicsRenderPassDescription& pass = descr.newGraphicsRenderPass("Temporal AA");