소스 검색

Some renaming

Panagiotis Christopoulos Charitos 1 년 전
부모
커밋
47d311cd7b

+ 3 - 3
AnKi/Renderer/LightShading.cpp

@@ -17,7 +17,7 @@
 #include <AnKi/Renderer/VrsSriGeneration.h>
 #include <AnKi/Renderer/ClusterBinning.h>
 #include <AnKi/Renderer/Ssao.h>
-#include <AnKi/Renderer/RtReflections.h>
+#include <AnKi/Renderer/Reflections.h>
 #include <AnKi/Util/CVarSet.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Scene/Components/SkyboxComponent.h>
@@ -94,7 +94,7 @@ void LightShading::run(const RenderingContext& ctx, RenderPassWorkContext& rgrap
 		rgraphCtx.bindSrv(8, 0, getRenderer().getGBuffer().getDepthRt());
 		rgraphCtx.bindSrv(9, 0, getRenderer().getShadowmapsResolve().getRt());
 		rgraphCtx.bindSrv(10, 0, getRenderer().getSsao().getRt());
-		rgraphCtx.bindSrv(11, 0, getRenderer().getRtReflections().getRt());
+		rgraphCtx.bindSrv(11, 0, getRenderer().getReflections().getRt());
 		cmdb.bindSrv(12, 0, TextureView(&getRenderer().getProbeReflections().getIntegrationLut(), TextureSubresourceDesc::all()));
 
 		// Draw
@@ -264,7 +264,7 @@ void LightShading::populateRenderGraph(RenderingContext& ctx)
 	pass.newBufferDependency(getRenderer().getClusterBinning().getPackedObjectsBufferHandle(GpuSceneNonRenderableObjectType::kLight),
 							 BufferUsageBit::kSrvPixel);
 	pass.newTextureDependency(getRenderer().getSsao().getRt(), readUsage);
-	pass.newTextureDependency(getRenderer().getRtReflections().getRt(), readUsage);
+	pass.newTextureDependency(getRenderer().getReflections().getRt(), readUsage);
 
 	if(getRenderer().getProbeReflections().getHasCurrentlyRefreshedReflectionRt())
 	{

+ 10 - 10
AnKi/Renderer/RtReflections.cpp → AnKi/Renderer/Reflections.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <AnKi/Renderer/RtReflections.h>
+#include <AnKi/Renderer/Reflections.h>
 #include <AnKi/Renderer/Renderer.h>
 #include <AnKi/Renderer/AccelerationStructureBuilder.h>
 #include <AnKi/Renderer/GBuffer.h>
@@ -22,7 +22,7 @@
 
 namespace anki {
 
-Error RtReflections::init()
+Error Reflections::init()
 {
 	const Bool bRtReflections = GrManager::getSingleton().getDeviceCapabilities().m_rayTracingEnabled && g_rtReflectionsCVar;
 
@@ -34,7 +34,7 @@ Error RtReflections::init()
 	// Ray gen and miss
 	if(bRtReflections)
 	{
-		ANKI_CHECK(ResourceManager::getSingleton().loadResource("ShaderBinaries/RtReflections.ankiprogbin", m_rtProg));
+		ANKI_CHECK(ResourceManager::getSingleton().loadResource("ShaderBinaries/Reflections.ankiprogbin", m_rtProg));
 
 		ShaderProgramResourceVariantInitInfo variantInitInfo(m_rtProg);
 		variantInitInfo.requestTechniqueAndTypes(ShaderTypeBit::kRayGen, "RtMaterialFetch");
@@ -49,14 +49,14 @@ Error RtReflections::init()
 		m_missShaderGroupIdx = variant->getShaderGroupHandleIndex();
 	}
 
-	ANKI_CHECK(loadShaderProgram("ShaderBinaries/RtReflections.ankiprogbin", {}, m_rtProg, m_spatialDenoisingGrProg, "SpatialDenoise"));
-	ANKI_CHECK(loadShaderProgram("ShaderBinaries/RtReflections.ankiprogbin", {}, m_rtProg, m_temporalDenoisingGrProg, "TemporalDenoise"));
+	ANKI_CHECK(loadShaderProgram("ShaderBinaries/Reflections.ankiprogbin", {}, m_rtProg, m_spatialDenoisingGrProg, "SpatialDenoise"));
+	ANKI_CHECK(loadShaderProgram("ShaderBinaries/Reflections.ankiprogbin", {}, m_rtProg, m_temporalDenoisingGrProg, "TemporalDenoise"));
 	ANKI_CHECK(
-		loadShaderProgram("ShaderBinaries/RtReflections.ankiprogbin", {}, m_rtProg, m_verticalBilateralDenoisingGrProg, "BilateralDenoiseVertical"));
-	ANKI_CHECK(loadShaderProgram("ShaderBinaries/RtReflections.ankiprogbin", {}, m_rtProg, m_horizontalBilateralDenoisingGrProg,
+		loadShaderProgram("ShaderBinaries/Reflections.ankiprogbin", {}, m_rtProg, m_verticalBilateralDenoisingGrProg, "BilateralDenoiseVertical"));
+	ANKI_CHECK(loadShaderProgram("ShaderBinaries/Reflections.ankiprogbin", {}, m_rtProg, m_horizontalBilateralDenoisingGrProg,
 								 "BilateralDenoiseHorizontal"));
-	ANKI_CHECK(loadShaderProgram("ShaderBinaries/RtReflections.ankiprogbin", {}, m_rtProg, m_ssrGrProg, "Ssr"));
-	ANKI_CHECK(loadShaderProgram("ShaderBinaries/RtReflections.ankiprogbin", {}, m_rtProg, m_probeFallbackGrProg, "ReflectionProbeFallback"));
+	ANKI_CHECK(loadShaderProgram("ShaderBinaries/Reflections.ankiprogbin", {}, m_rtProg, m_ssrGrProg, "Ssr"));
+	ANKI_CHECK(loadShaderProgram("ShaderBinaries/Reflections.ankiprogbin", {}, m_rtProg, m_probeFallbackGrProg, "ReflectionProbeFallback"));
 
 	m_sbtRecordSize = getAlignedRoundUp(GrManager::getSingleton().getDeviceCapabilities().m_sbtRecordAlignment,
 										GrManager::getSingleton().getDeviceCapabilities().m_shaderGroupHandleSize + U32(sizeof(UVec4)));
@@ -119,7 +119,7 @@ Error RtReflections::init()
 	return Error::kNone;
 }
 
-void RtReflections::populateRenderGraph(RenderingContext& ctx)
+void Reflections::populateRenderGraph(RenderingContext& ctx)
 {
 	RenderGraphBuilder& rgraph = ctx.m_renderGraphDescr;
 

+ 3 - 3
AnKi/Renderer/RtReflections.h → AnKi/Renderer/Reflections.h

@@ -18,12 +18,12 @@ inline NumericCVar<F32> g_rtReflectionsMaxRayDistanceCVar("R", "RtReflectionsMax
 inline NumericCVar<U32> g_ssrStepIncrementCVar("R", "SsrStepIncrement", 32, 1, 256, "The number of steps for each loop");
 inline NumericCVar<U32> g_ssrMaxIterationsCVar("R", "SsrMaxIterations", 64, 1, 256, "Max SSR raymarching loop iterations");
 
-class RtReflections : public RendererObject
+class Reflections : public RendererObject
 {
 public:
-	RtReflections()
+	Reflections()
 	{
-		registerDebugRenderTarget("RtReflections");
+		registerDebugRenderTarget("Reflections");
 	}
 
 	Error init();

+ 2 - 2
AnKi/Renderer/Renderer.cpp

@@ -47,7 +47,7 @@
 #include <AnKi/Renderer/Sky.h>
 #include <AnKi/Renderer/MotionBlur.h>
 #include <AnKi/Renderer/RtMaterialFetchDbg.h>
-#include <AnKi/Renderer/RtReflections.h>
+#include <AnKi/Renderer/Reflections.h>
 #include <AnKi/Renderer/Utils/Drawer.h>
 #include <AnKi/Renderer/Utils/GpuVisibility.h>
 #include <AnKi/Renderer/Utils/MipmapGenerator.h>
@@ -295,7 +295,7 @@ Error Renderer::populateRenderGraph(RenderingContext& ctx)
 		m_rtMaterialFetchDbg->populateRenderGraph(ctx);
 	}
 
-	m_rtReflections->populateRenderGraph(ctx);
+	m_reflections->populateRenderGraph(ctx);
 	m_shadowmapsResolve->populateRenderGraph(ctx);
 	m_volumetricFog->populateRenderGraph(ctx);
 	m_lensFlare->populateRenderGraph(ctx);

+ 1 - 1
AnKi/Renderer/RendererObject.def.h

@@ -37,7 +37,7 @@ ANKI_RENDERER_OBJECT_DEF(GeneratedSky, generatedSky, 1)
 ANKI_RENDERER_OBJECT_DEF(MotionBlur, motionBlur, 1)
 ANKI_RENDERER_OBJECT_DEF(RtMaterialFetchDbg, rtMaterialFetchDbg,
 						 GrManager::getSingleton().getDeviceCapabilities().m_rayTracingEnabled&& g_rtMaterialFetchDbgCVar)
-ANKI_RENDERER_OBJECT_DEF(RtReflections, rtReflections, 1)
+ANKI_RENDERER_OBJECT_DEF(Reflections, reflections, 1)
 
 // Util objects
 ANKI_RENDERER_OBJECT_DEF(RenderableDrawer, drawer, 1)

+ 0 - 0
AnKi/Shaders/RtReflections.ankiprog → AnKi/Shaders/Reflections.ankiprog


+ 1 - 1
Sandbox/Main.cpp

@@ -343,7 +343,7 @@ Error MyApp::userMainLoop(Bool& quit, Second elapsedTime)
 
 	if(in.getKey(KeyCode::kU) == 1)
 	{
-		renderer.setCurrentDebugRenderTarget((renderer.getCurrentDebugRenderTarget() == "RtReflections") ? "" : "RtReflections");
+		renderer.setCurrentDebugRenderTarget((renderer.getCurrentDebugRenderTarget() == "Reflections") ? "" : "Reflections");
 	}
 
 	if(in.getKey(KeyCode::kI) == 1)