Some renaming

shaders/NearDepthUpscale.vert.glsl

@@ -1,22 +0,0 @@
-// Copyright (C) 2009-2016, Panagiotis Christopoulos Charitos and contributors.
-// All rights reserved.
-// Code licensed under the BSD License.
-// http://www.anki3d.org/LICENSE
-
-#include "shaders/Common.glsl"
-
-out gl_PerVertex
-{
-	vec4 gl_Position;
-};
-
-layout(location = 0) out vec2 out_uv;
-
-void main()
-{
-	const vec2 POSITIONS[3] = vec2[](vec2(-1.0, -1.0), vec2(3.0, -1.0), vec2(-1.0, 3.0));
-
-	vec2 pos = POSITIONS[gl_VertexID];
-	gl_Position = vec4(pos, 0.0, 1.0);
-	out_uv = pos * 0.5 + 0.5;
-}

src/anki/renderer/Common.h

@@ -26,7 +26,7 @@ class Pps;
 class Dbg;
 class Tiler;
 class Ir;
-class Upsample;
+class FsUpscale;
 class DownscaleBlur;
 class Volumetric;
 class HalfDepth;

src/anki/renderer/Upsample.cpp → src/anki/renderer/FsUpscale.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/renderer/Upsample.h>
+#include <anki/renderer/FsUpscale.h>
 #include <anki/renderer/Renderer.h>
 #include <anki/renderer/Ms.h>
 #include <anki/renderer/Is.h>
@@ -15,7 +15,7 @@
 namespace anki
 {
 
-Error Upsample::init(const ConfigSet& config)
+Error FsUpscale::init(const ConfigSet& config)
 {
 	GrManager& gr = getGrManager();
 
@@ -57,10 +57,10 @@ Error Upsample::init(const ConfigSet& config)
 		1);
 
 	ANKI_CHECK(
-		getResourceManager().loadResourceToCache(m_frag, "shaders/NearDepthUpscale.frag.glsl", pps.toCString(), "r_"));
+		getResourceManager().loadResourceToCache(m_frag, "shaders/FsUpscale.frag.glsl", pps.toCString(), "r_"));
 
 	ANKI_CHECK(
-		getResourceManager().loadResourceToCache(m_vert, "shaders/NearDepthUpscale.vert.glsl", pps.toCString(), "r_"));
+		getResourceManager().loadResourceToCache(m_vert, "shaders/Quad.vert.glsl", pps.toCString(), "r_"));
 
 	// Ppline
 	PipelineInitInfo ppinit;
@@ -88,7 +88,7 @@ Error Upsample::init(const ConfigSet& config)
 	return ErrorCode::NONE;
 }
 
-void Upsample::run(RenderingContext& ctx)
+void FsUpscale::run(RenderingContext& ctx)
 {
 	CommandBufferPtr cmdb = ctx.m_commandBuffer;
 	TransientMemoryInfo dyn;

src/anki/renderer/Upsample.h → src/anki/renderer/FsUpscale.h

@@ -13,11 +13,11 @@ namespace anki
 /// @addtogroup renderer
 /// @{
 
-/// Upsample some textures and append them to IS.
-class Upsample : public RenderingPass
+/// Upscale some textures and append them to IS.
+class FsUpscale : public RenderingPass
 {
 public:
-	Upsample(Renderer* r)
+	FsUpscale(Renderer* r)
 		: RenderingPass(r)
 	{
 	}

src/anki/renderer/Renderer.cpp

@@ -21,7 +21,7 @@
 #include <anki/renderer/Lf.h>
 #include <anki/renderer/Dbg.h>
 #include <anki/renderer/Tiler.h>
-#include <anki/renderer/Upsample.h>
+#include <anki/renderer/FsUpscale.h>
 #include <anki/renderer/DownscaleBlur.h>
 #include <anki/renderer/Volumetric.h>
 #include <anki/renderer/HalfDepth.h>
@@ -159,8 +159,8 @@ Error Renderer::initInternal(const ConfigSet& config)
 	m_ssao.reset(m_alloc.newInstance<Ssao>(this));
 	ANKI_CHECK(m_ssao->init(config));
 
-	m_upsample.reset(m_alloc.newInstance<Upsample>(this));
-	ANKI_CHECK(m_upsample->init(config));
+	m_fsUpscale.reset(m_alloc.newInstance<FsUpscale>(this));
+	ANKI_CHECK(m_fsUpscale->init(config));
 
 	m_tm.reset(getAllocator().newInstance<Tm>(this));
 	ANKI_CHECK(m_tm->create(config));
@@ -254,7 +254,7 @@ Error Renderer::render(RenderingContext& ctx)
 	m_ssao->setPostRunBarriers(ctx);
 	m_fs->setPostRunBarriers(ctx);
 
-	m_upsample->run(ctx);
+	m_fsUpscale->run(ctx);
 
 	cmdb->setTextureSurfaceBarrier(m_is->getRt(),
 		TextureUsageBit::FRAMEBUFFER_ATTACHMENT_READ_WRITE,

src/anki/renderer/Renderer.h

@@ -370,7 +370,7 @@ private:
 	UniquePtr<Fs> m_fs; ///< Forward shading.
 	UniquePtr<Volumetric> m_vol; ///< Volumetric effects.
 	UniquePtr<Lf> m_lf; ///< Forward shading lens flares.
-	UniquePtr<Upsample> m_upsample;
+	UniquePtr<FsUpscale> m_fsUpscale;
 	UniquePtr<DownscaleBlur> m_downscale;
 	UniquePtr<Smaa> m_smaa;
 	UniquePtr<Tm> m_tm;