Renaming program to shader

include/anki/renderer/Bl.h

@@ -9,12 +9,12 @@
 #include "anki/renderer/RenderingPass.h"
 #include "anki/resource/TextureResource.h"
 #include "anki/resource/Resource.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/Gr.h"
 
 namespace anki {
 
-class ProgramResource;
+class ShaderResource;
 
 /// Blurring rendering pass
 class Bl: public RenderingPass
@@ -64,9 +64,9 @@ private:
 	Fbo vBlurFbo; ///< Fbo that writes to postPassSProg
 	Fbo sideBlurFbo;
 
-	ProgramResourcePointer hBlurSProg;
-	ProgramResourcePointer vBlurSProg;
-	ProgramResourcePointer sideBlurSProg;
+	ShaderResourcePointer hBlurSProg;
+	ShaderResourcePointer vBlurSProg;
+	ShaderResourcePointer sideBlurSProg;
 
 	Texture blurFai; ///< Temp FAI for blurring
 	TextureResourcePointer sideBlurMap;

include/anki/renderer/DebugDrawer.h

@@ -83,8 +83,8 @@ private:
 		Vec4 m_color;
 	};
 
-	ProgramResourcePointer m_frag;
-	ProgramResourcePointer m_vert;
+	ShaderResourcePointer m_frag;
+	ShaderResourcePointer m_vert;
 	PipelineHandle m_ppline;
 	CommandBufferHandle m_jobs;
 

include/anki/renderer/Deformer.h

@@ -10,7 +10,7 @@
 
 namespace anki {
 
-class ProgramResource;
+class ShaderResource;
 class SkinPatchNode;
 class SkinNode;
 
@@ -34,10 +34,10 @@ public:
 
 private:
 	/// Shader program that deforms all attribs
-	ProgramResourcePointer tfHwSkinningAllSProg;
+	ShaderResourcePointer tfHwSkinningAllSProg;
 
 	/// Shader program that deforms only the position attribute
-	ProgramResourcePointer tfHwSkinningPosSProg;
+	ShaderResourcePointer tfHwSkinningPosSProg;
 
 	void init();
 };

include/anki/renderer/Hdr.h

@@ -9,7 +9,7 @@
 #include "anki/renderer/RenderingPass.h"
 #include "anki/Gr.h"
 #include "anki/resource/TextureResource.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/resource/Resource.h"
 #include "anki/core/Timestamp.h"
 
@@ -75,9 +75,9 @@ private:
 	FramebufferHandle m_hblurFb;
 	FramebufferHandle m_vblurFb;
 
-	ProgramResourcePointer m_toneFrag;
-	ProgramResourcePointer m_hblurFrag;
-	ProgramResourcePointer m_vblurFrag;
+	ShaderResourcePointer m_toneFrag;
+	ShaderResourcePointer m_hblurFrag;
+	ShaderResourcePointer m_vblurFrag;
 
 	PipelineHandle m_tonePpline;
 	PipelineHandle m_hblurPpline;

include/anki/renderer/Is.h

@@ -9,7 +9,7 @@
 #include "anki/renderer/RenderingPass.h"
 #include "anki/resource/TextureResource.h"
 #include "anki/resource/Resource.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/Gr.h"
 #include "anki/Math.h"
 #include "anki/renderer/Sm.h"
@@ -93,8 +93,8 @@ private:
 	/// @}
 
 	// Light shaders
-	ProgramResourcePointer m_lightVert;
-	ProgramResourcePointer m_lightFrag;
+	ShaderResourcePointer m_lightVert;
+	ShaderResourcePointer m_lightFrag;
 	PipelineHandle m_lightPpline;
 
 	/// Shadow mapping

include/anki/renderer/Lf.h

@@ -9,7 +9,7 @@
 #include "anki/renderer/RenderingPass.h"
 #include "anki/Gr.h"
 #include "anki/resource/Resource.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/resource/TextureResource.h"
 
 namespace anki {
@@ -53,26 +53,26 @@ private:
 	// Occlusion query
 	Array<BufferHandle, 3> m_positionsVertBuff;
 	BufferHandle m_mvpBuff;
-	ProgramResourcePointer m_occlusionVert;
-	ProgramResourcePointer m_occlusionFrag;
+	ShaderResourcePointer m_occlusionVert;
+	ShaderResourcePointer m_occlusionFrag;
 	PipelineHandle m_occlusionPpline;
 
 	// Pseudo flares
-	ProgramResourcePointer m_pseudoFrag;
+	ShaderResourcePointer m_pseudoFrag;
 	PipelineHandle m_pseudoPpline;
 	TextureResourcePointer m_lensDirtTex;
 	U8 m_maxSpritesPerFlare;
 	U8 m_maxFlares;
 
 	// Sprite billboards
-	ProgramResourcePointer m_realVert;
-	ProgramResourcePointer m_realFrag;
+	ShaderResourcePointer m_realVert;
+	ShaderResourcePointer m_realFrag;
 	PipelineHandle m_realPpline;
 	Array<BufferHandle, 3> m_flareDataBuff;
 	U32 m_flareSize;
 
 	// Final HDR blit
-	ProgramResourcePointer m_blitFrag;
+	ShaderResourcePointer m_blitFrag;
 	PipelineHandle m_blitPpline;
 
 	ANKI_USE_RESULT Error initPseudo(

include/anki/renderer/MainRenderer.h

@@ -37,7 +37,7 @@ public:
 	void takeScreenshot(const char* filename);
 
 private:
-	ProgramResourcePointer m_blitFrag;
+	ShaderResourcePointer m_blitFrag;
 	PipelineHandle m_blitPpline;
 
 	/// Optimize job chain

include/anki/renderer/Pps.h

@@ -95,7 +95,7 @@ private:
 	Sslr m_sslr;
 
 	FramebufferHandle m_fb;
-	ProgramResourcePointer m_frag;
+	ShaderResourcePointer m_frag;
 	PipelineHandle m_ppline;
 	TextureHandle m_rt;
 

include/anki/renderer/Renderer.h

@@ -10,7 +10,7 @@
 #include "anki/Math.h"
 #include "anki/resource/ResourceManager.h"
 #include "anki/resource/TextureResource.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/Gr.h"
 #include "anki/util/HighRezTimer.h"
 #include "anki/scene/Forward.h"
@@ -187,9 +187,9 @@ public:
 		return m_tilesCountXY;
 	}
 
-	const ShaderHandle& getDrawQuadVertexProgram() const
+	const ShaderHandle& getDrawQuadVertexShader() const
 	{
-		return m_drawQuadVert->getGlProgram();
+		return m_drawQuadVert->getGrShader();
 	}
 
 	FramebufferHandle& getDefaultFramebuffer()
@@ -313,7 +313,7 @@ private:
 	/// @name For drawing a quad into the active framebuffer
 	/// @{
 	BufferHandle m_quadPositionsBuff; ///< The VBO for quad positions
-	ProgramResourcePointer m_drawQuadVert;
+	ShaderResourcePointer m_drawQuadVert;
 	/// @}
 
 	/// @name Optimization vars

include/anki/renderer/RenderingPass.h

@@ -10,7 +10,7 @@
 #include "anki/Gr.h"
 #include "anki/core/Timestamp.h"
 #include "anki/resource/ResourceManager.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 
 namespace anki {
 
@@ -71,7 +71,7 @@ protected:
 	public:
 		FramebufferHandle m_fb;
 		TextureHandle m_rt; 
-		ProgramResourcePointer m_frag;
+		ShaderResourcePointer m_frag;
 		PipelineHandle m_ppline;
 	};
 

include/anki/renderer/Ssao.h

@@ -7,7 +7,7 @@
 #define ANKI_RENDERER_SSAO_H
 
 #include "anki/renderer/RenderingPass.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/resource/TextureResource.h"
 #include "anki/resource/Resource.h"
 #include "anki/Gr.h"
@@ -39,9 +39,9 @@ private:
 	FramebufferHandle m_vblurFb;
 	FramebufferHandle m_hblurFb;
 
-	ProgramResourcePointer m_ssaoFrag;
-	ProgramResourcePointer m_hblurFrag;
-	ProgramResourcePointer m_vblurFrag;
+	ShaderResourcePointer m_ssaoFrag;
+	ShaderResourcePointer m_hblurFrag;
+	ShaderResourcePointer m_vblurFrag;
 	PipelineHandle m_ssaoPpline;
 	PipelineHandle m_hblurPpline;
 	PipelineHandle m_vblurPpline;

include/anki/renderer/Sslr.h

@@ -34,12 +34,12 @@ private:
 	U32 m_height;
 
 	// 1st pass
-	ProgramResourcePointer m_reflectionFrag;
+	ShaderResourcePointer m_reflectionFrag;
 	PipelineHandle m_reflectionPpline;
 	SamplerHandle m_depthMapSampler;
 
 	// 2nd pass: blit
-	ProgramResourcePointer m_blitFrag;
+	ShaderResourcePointer m_blitFrag;
 	PipelineHandle m_blitPpline;
 
 	Sslr(Renderer* r)

include/anki/renderer/Tiler.h

@@ -115,7 +115,7 @@ private:
 	DArray<Vec2> m_prevMinMaxDepth;
 
 	/// Main shader program
-	ProgramResourcePointer m_frag;
+	ShaderResourcePointer m_frag;
 	PipelineHandle m_ppline;
 
 	/// Used to check if the camera is changed and we need to update the planes

include/anki/resource/Material.h

@@ -7,7 +7,7 @@
 #define ANKI_RESOURCE_MATERIAL_H
 
 #include "anki/resource/ResourceManager.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/resource/RenderingKey.h"
 #include "anki/Math.h"
 #include "anki/util/Visitor.h"
@@ -370,7 +370,7 @@ private:
 	ResourceDArray<MaterialVariable*> m_vars;
 	Dictionary<MaterialVariable*> m_varDict;
 
-	ResourceDArray<ProgramResourcePointer> m_progs;
+	ResourceDArray<ShaderResourcePointer> m_progs;
 	ResourceDArray<PipelineHandle> m_pplines;
 
 	U32 m_shaderBlockSize;
@@ -379,7 +379,7 @@ private:
 	U64 m_hash;
 
 	/// Get a program resource
-	ProgramResourcePointer& getProgram(
+	ShaderResourcePointer& getProgram(
 		const RenderingKey key, ShaderType shaderId);
 
 	/// Parse what is within the @code <material></material> @endcode

include/anki/resource/ResourceManager.h

@@ -28,7 +28,7 @@ class AsyncLoader;
 
 ANKI_RESOURCE(Animation, AnimationResourcePointer)
 ANKI_RESOURCE(TextureResource, TextureResourcePointer)
-ANKI_RESOURCE(ProgramResource, ProgramResourcePointer)
+ANKI_RESOURCE(ShaderResource, ShaderResourcePointer)
 ANKI_RESOURCE(Material, MaterialResourcePointer)
 ANKI_RESOURCE(Mesh, MeshResourcePointer)
 ANKI_RESOURCE(BucketMesh, BucketMeshResourcePointer)
@@ -129,7 +129,7 @@ private:
 class ResourceManager: 
 	ANKI_RESOURCE(Animation),
 	ANKI_RESOURCE(TextureResource),
-	ANKI_RESOURCE(ProgramResource),
+	ANKI_RESOURCE(ShaderResource),
 	ANKI_RESOURCE(Material),
 	ANKI_RESOURCE(Mesh),
 	ANKI_RESOURCE(BucketMesh),

include/anki/resource/ProgramResource.h → include/anki/resource/ShaderResource.h

@@ -14,18 +14,17 @@ namespace anki {
 /// @addtogroup resource
 /// @{
 
-// TODO rename this class
-/// Shader program resource
-class ProgramResource
+/// Shader resource
+class ShaderResource
 {
 public:
-	ProgramResource(ResourceAllocator<U8>&)
+	ShaderResource(ResourceAllocator<U8>&)
 	{}
 
-	~ProgramResource()
+	~ShaderResource()
 	{}
 
-	const ShaderHandle& getGlProgram() const
+	const ShaderHandle& getGrShader() const
 	{
 		return m_shader;
 	}

src/renderer/Bl.cpp

@@ -5,7 +5,7 @@
 
 #include "anki/renderer/Bl.h"
 #include "anki/renderer/Renderer.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 
 namespace anki {
 
@@ -38,7 +38,7 @@ void Bl::init(const ConfigSet& initializer)
 			"post-processing stage FBO") << e;
 	}
 
-	hBlurSProg.load(ProgramResource::createSrcCodeToCache(
+	hBlurSProg.load(ShaderResource::createSrcCodeToCache(
 		"shaders/PpsBlurGeneric.glsl", "#define HPASS\n").c_str());
 
 	// Vertical
@@ -54,7 +54,7 @@ void Bl::init(const ConfigSet& initializer)
 			"post-processing stage FBO") << e;
 	}
 
-	vBlurSProg.load(ProgramResource::createSrcCodeToCache(
+	vBlurSProg.load(ShaderResource::createSrcCodeToCache(
 		"shaders/PpsBlurGeneric.glsl", "#define VPASS\n").c_str());
 
 	// Side blur

src/renderer/Dbg.cpp

@@ -5,7 +5,7 @@
 
 #include "anki/renderer/Dbg.h"
 #include "anki/renderer/Renderer.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/scene/SceneGraph.h"
 #include "anki/scene/Camera.h"
 #include "anki/scene/Light.h"

src/renderer/DebugDrawer.cpp

@@ -5,7 +5,7 @@
 
 #include "anki/renderer/DebugDrawer.h"
 #include "anki/renderer/Renderer.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/Collision.h"
 #include "anki/Scene.h"
 #include "anki/resource/TextureResource.h"
@@ -50,7 +50,7 @@ Error DebugDrawer::create(Renderer* r)
 	if(!err)
 	{
 		err = m_ppline.create(jobs, 
-			{m_vert->getGlProgram(), m_frag->getGlProgram()});
+			{m_vert->getGrShader(), m_frag->getGrShader()});
 	}
 
 	if(!err)

src/renderer/Deformer.cpp

@@ -4,7 +4,7 @@
 // http://www.anki3d.org/LICENSE
 
 #include "anki/renderer/Deformer.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/resource/Material.h"
 #include "anki/scene/SkinNode.h"
 

src/renderer/Drawer.cpp

@@ -4,7 +4,7 @@
 // http://www.anki3d.org/LICENSE
 
 #include "anki/renderer/Drawer.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/scene/FrustumComponent.h"
 #include "anki/resource/Material.h"
 #include "anki/scene/RenderComponent.h"

src/renderer/Hdr.cpp

@@ -89,7 +89,7 @@ Error Hdr::initInternal(const ConfigSet& initializer)
 	if(err) return err;
 
 	err = m_r->createDrawQuadPipeline(
-		m_toneFrag->getGlProgram(), m_tonePpline);
+		m_toneFrag->getGrShader(), m_tonePpline);
 	if(err) return err;
 
 	const char* SHADER_FILENAME = 
@@ -112,7 +112,7 @@ Error Hdr::initInternal(const ConfigSet& initializer)
 	if(err) return err;
 
 	err = m_r->createDrawQuadPipeline(
-		m_hblurFrag->getGlProgram(), m_hblurPpline);
+		m_hblurFrag->getGrShader(), m_hblurPpline);
 	if(err) return err;
 
 	pps.destroy(getAllocator());
@@ -131,7 +131,7 @@ Error Hdr::initInternal(const ConfigSet& initializer)
 	if(err) return err;
 
 	err = m_r->createDrawQuadPipeline(
-		m_vblurFrag->getGlProgram(), m_vblurPpline);
+		m_vblurFrag->getGrShader(), m_vblurPpline);
 	if(err) return err;
 
 	// Set timestamps

src/renderer/Is.cpp

@@ -228,7 +228,7 @@ Error Is::initInternal(const ConfigSet& config)
 	}
 
 	err = m_lightPpline.create(cmdBuff, 
-		{m_lightVert->getGlProgram(), m_lightFrag->getGlProgram()});
+		{m_lightVert->getGrShader(), m_lightFrag->getGrShader()});
 	if(err)
 	{
 		return err;

src/renderer/Lf.cpp

@@ -78,7 +78,7 @@ Error Lf::initPseudo(const ConfigSet& config,
 	if(err) return err;
 
 	err = m_r->createDrawQuadPipeline(
-		m_pseudoFrag->getGlProgram(), m_pseudoPpline);
+		m_pseudoFrag->getGrShader(), m_pseudoPpline);
 	if(err) return err;
 
 	// Textures
@@ -121,7 +121,7 @@ Error Lf::initSprite(const ConfigSet& config,
 	}
 
 	err = m_realPpline.create(cmdBuff,
-		{m_realVert->getGlProgram(), m_realFrag->getGlProgram()});
+		{m_realVert->getGrShader(), m_realFrag->getGrShader()});
 	if(err)
 	{
 		return err;
@@ -192,7 +192,7 @@ Error Lf::initOcclusion(
 	}
 
 	err = m_occlusionPpline.create(cmdBuff,
-		{m_occlusionVert->getGlProgram(), m_occlusionFrag->getGlProgram()});
+		{m_occlusionVert->getGrShader(), m_occlusionFrag->getGrShader()});
 	if(err)
 	{
 		return err;
@@ -262,7 +262,7 @@ Error Lf::initInternal(const ConfigSet& config)
 	}
 
 	err = m_r->createDrawQuadPipeline(
-		m_blitFrag->getGlProgram(), m_blitPpline);
+		m_blitFrag->getGrShader(), m_blitPpline);
 	if(err)
 	{
 		return err;

src/renderer/MainRenderer.cpp

@@ -45,7 +45,7 @@ Error MainRenderer::create(
 	if(err) return err;
 
 	err = createDrawQuadPipeline(
-		m_blitFrag->getGlProgram(), m_blitPpline);
+		m_blitFrag->getGrShader(), m_blitPpline);
 	if(err) return err;
 
 	ANKI_LOGI("Main renderer initialized. Rendering size %dx%d", 

src/renderer/Pps.cpp

@@ -76,7 +76,7 @@ Error Pps::initInternal(const ConfigSet& config)
 	ANKI_CHECK(m_frag.loadToCache(&getResourceManager(),
 		"shaders/Pps.frag.glsl", pps.toCString(), "r_"));
 
-	ANKI_CHECK(m_r->createDrawQuadPipeline(m_frag->getGlProgram(), m_ppline));
+	ANKI_CHECK(m_r->createDrawQuadPipeline(m_frag->getGrShader(), m_ppline));
 
 	cmdBuff.finish();
 

src/renderer/Renderer.cpp

@@ -371,7 +371,7 @@ Error Renderer::createDrawQuadPipeline(
 	if(!err)
 	{
 		Array<ShaderHandle, 2> progs = 
-			{{m_drawQuadVert->getGlProgram(), frag}};
+			{{m_drawQuadVert->getGrShader(), frag}};
 
 		err = ppline.create(cmdBuff, &progs[0], &progs[0] + 2);
 	}

src/renderer/RenderingPass.cpp

@@ -90,7 +90,7 @@ Error BlurringRenderingPass::initBlurring(
 			pps[i].toCString(), "r_"));
 
 		ANKI_CHECK(r.createDrawQuadPipeline(
-			dir.m_frag->getGlProgram(), dir.m_ppline));
+			dir.m_frag->getGrShader(), dir.m_ppline));
 	}
 
 	cmdb.finish();

src/renderer/Ssao.cpp

@@ -208,7 +208,7 @@ Error Ssao::initInternal(const ConfigSet& config)
 	if(err) return err;
 
 	err = m_r->createDrawQuadPipeline(
-		m_ssaoFrag->getGlProgram(), m_ssaoPpline);
+		m_ssaoFrag->getGrShader(), m_ssaoPpline);
 	if(err) return err;
 
 	// blurring progs
@@ -229,7 +229,7 @@ Error Ssao::initInternal(const ConfigSet& config)
 	if(err) return err;
 
 	err = m_r->createDrawQuadPipeline(
-		m_hblurFrag->getGlProgram(), m_hblurPpline);
+		m_hblurFrag->getGrShader(), m_hblurPpline);
 	if(err) return err;
 
 	pps.destroy(getAllocator());
@@ -246,7 +246,7 @@ Error Ssao::initInternal(const ConfigSet& config)
 	if(err) return err;
 
 	err = m_r->createDrawQuadPipeline(
-		m_vblurFrag->getGlProgram(), m_vblurPpline);
+		m_vblurFrag->getGrShader(), m_vblurPpline);
 	if(err) return err;
 
 	cmdb.flush();

src/renderer/Sslr.cpp

@@ -52,7 +52,7 @@ Error Sslr::init(const ConfigSet& config)
 	}
 
 	err = m_r->createDrawQuadPipeline(
-		m_reflectionFrag->getGlProgram(), m_reflectionPpline);
+		m_reflectionFrag->getGrShader(), m_reflectionPpline);
 	if(err)
 	{
 		return err;
@@ -78,7 +78,7 @@ Error Sslr::init(const ConfigSet& config)
 	{
 		return err;
 	}
-	err = m_r->createDrawQuadPipeline(m_blitFrag->getGlProgram(), m_blitPpline);
+	err = m_r->createDrawQuadPipeline(m_blitFrag->getGrShader(), m_blitPpline);
 	if(err)
 	{
 		return err;

src/renderer/Tiler.cpp

@@ -5,7 +5,7 @@
 
 #include "anki/renderer/Tiler.h"
 #include "anki/renderer/Renderer.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/scene/Camera.h"
 #include "anki/scene/SceneGraph.h"
 #include "anki/util/Rtti.h"
@@ -102,7 +102,7 @@ Error Tiler::initInternal()
 		"shaders/TilerMinMax.frag.glsl", pps.toCString(), "r_"));
 
 	ANKI_CHECK(
-		m_r->createDrawQuadPipeline(m_frag->getGlProgram(), m_ppline));
+		m_r->createDrawQuadPipeline(m_frag->getGrShader(), m_ppline));
 
 	// Create FB
 	ANKI_CHECK(

src/resource/Material.cpp

@@ -7,7 +7,7 @@
 #include "anki/resource/MaterialProgramCreator.h"
 #include "anki/core/App.h"
 #include "anki/util/Logger.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/resource/TextureResource.h"
 #include "anki/util/Hash.h"
 #include "anki/util/File.h"
@@ -295,15 +295,15 @@ U Material::getShaderIndex(const RenderingKey key, ShaderType type) const
 }
 
 //==============================================================================
-ProgramResourcePointer& Material::getProgram(
+ShaderResourcePointer& Material::getProgram(
 	const RenderingKey key, ShaderType type)
 {
-	ProgramResourcePointer& out = m_progs[getShaderIndex(key, type)];
+	ShaderResourcePointer& out = m_progs[getShaderIndex(key, type)];
 
 	if(out.isLoaded())
 	{
 		ANKI_ASSERT(
-			computeShaderTypeIndex(out->getGlProgram().getType()) == type);
+			computeShaderTypeIndex(out->getGrShader().getType()) == type);
 	}
 
 	return out;
@@ -340,18 +340,18 @@ Error Material::getProgramPipeline(
 		U progCount = 0;
 
 		progs[progCount++] = 
-			getProgram(key, ShaderType::VERTEX)->getGlProgram();
+			getProgram(key, ShaderType::VERTEX)->getGrShader();
 
 		if(key.m_tessellation)
 		{
 			progs[progCount++] = getProgram(
-				key, ShaderType::TESSELLATION_CONTROL)->getGlProgram();
+				key, ShaderType::TESSELLATION_CONTROL)->getGrShader();
 			progs[progCount++] = getProgram(
-				key, ShaderType::TESSELLATION_EVALUATION)->getGlProgram();
+				key, ShaderType::TESSELLATION_EVALUATION)->getGrShader();
 		}
 
 		progs[progCount++] = 
-			getProgram(key, ShaderType::FRAGMENT)->getGlProgram();
+			getProgram(key, ShaderType::FRAGMENT)->getGrShader();
 
 		GrManager& gl = m_resources->getGrManager();
 		CommandBufferHandle cmdBuff;
@@ -560,7 +560,7 @@ Error Material::parseMaterialTag(const XmlElement& materialEl,
 					ANKI_CHECK(createProgramSourceToCache(src, filename));
 
 					RenderingKey key((Pass)pid, level, tess);
-					ProgramResourcePointer& progr = getProgram(key, shader);
+					ShaderResourcePointer& progr = getProgram(key, shader);
 					ANKI_CHECK(
 						progr.load(filename.toCString(), &rinit.m_resources));
 

src/resource/Model.cpp

@@ -7,7 +7,7 @@
 #include "anki/resource/Material.h"
 #include "anki/resource/Mesh.h"
 #include "anki/resource/MeshLoader.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/misc/Xml.h"
 #include "anki/util/Logger.h"
 #include "anki/physics/PhysicsWorld.h"

src/resource/ResourceManager.cpp

@@ -11,7 +11,7 @@
 #include "anki/resource/Model.h"
 #include "anki/resource/Script.h"
 #include "anki/resource/DummyRsrc.h"
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/resource/ParticleEmitterResource.h"
 #include "anki/resource/TextureResource.h"
 #include "anki/util/Logger.h"
@@ -76,7 +76,7 @@ Error ResourceManager::create(Initializer& init)
 
 	ANKI_RESOURCE(Animation)
 	ANKI_RESOURCE(TextureResource)
-	ANKI_RESOURCE(ProgramResource)
+	ANKI_RESOURCE(ShaderResource)
 	ANKI_RESOURCE(Material)
 	ANKI_RESOURCE(Mesh)
 	ANKI_RESOURCE(BucketMesh)

src/resource/ProgramResource.cpp → src/resource/ShaderResource.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include "anki/resource/ProgramResource.h"
+#include "anki/resource/ShaderResource.h"
 #include "anki/resource/ProgramPrePreprocessor.h"
 #include "anki/resource/ResourceManager.h"
 #include "anki/core/App.h" // To get cache dir
@@ -15,13 +15,13 @@
 namespace anki {
 
 //==============================================================================
-Error ProgramResource::load(const CString& filename, ResourceInitializer& init)
+Error ShaderResource::load(const CString& filename, ResourceInitializer& init)
 {
 	return load(filename, " ", init.m_resources);
 }
 
 //==============================================================================
-Error ProgramResource::load(const CString& filename, const CString& extraSrc,
+Error ShaderResource::load(const CString& filename, const CString& extraSrc,
 	ResourceManager& manager)
 {
 	Error err = ErrorCode::NONE;
@@ -63,7 +63,7 @@ Error ProgramResource::load(const CString& filename, const CString& extraSrc,
 }
 
 //==============================================================================
-Error ProgramResource::createToCache(
+Error ShaderResource::createToCache(
 	const CString& filename, const CString& preAppendedSrcCode, 
 	const CString& filenamePrefix, ResourceManager& manager,
 	TempResourceString& out)