X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmaterials%2Frenderpass.cpp;fp=source%2Fmaterials%2Frenderpass.cpp;h=a055f4786bfed69a39c871087d31b47a123c6f1c;hb=5008778dbb1840bf7c6d479800d2b932f8386fb2;hp=499a521f1dc8ff17fb3270cfedfd4a370e90c62a;hpb=f3ee91e70df8a7fdc68f46427bf8a28f34f0cd24;p=libs%2Fgl.git

diff --git a/source/materials/renderpass.cpp b/source/materials/renderpass.cpp
index 499a521f..a055f478 100644
--- a/source/materials/renderpass.cpp
+++ b/source/materials/renderpass.cpp
@@ -1,6 +1,5 @@
 #include <msp/core/algorithm.h>
 #include <msp/datafile/collection.h>
-#include <msp/io/print.h>
 #include <msp/strings/format.h>
 #include "error.h"
 #include "renderpass.h"
@@ -163,17 +162,6 @@ void RenderPass::Loader::finish()
 		obj.maybe_create_material_shader();
 }
 
-// Temporary compatibility feature
-string RenderPass::Loader::get_shader_name(const string &n)
-{
-	if(n.size()>=5 && !n.compare(n.size()-5, 5, ".glsl"))
-	{
-		IO::print(IO::cerr, "Warning: Loading module '%s' as shader is deprecated\n", n);
-		return n+".shader";
-	}
-	return n;
-}
-
 void RenderPass::Loader::material_inline()
 {
 	Material::GenericLoader ldr(coll);
@@ -192,7 +180,7 @@ void RenderPass::Loader::material(const string &name)
 
 void RenderPass::Loader::shader(const string &n)
 {
-	obj.shprog = &get_collection().get<Program>(get_shader_name(n));
+	obj.shprog = &get_collection().get<Program>(n);
 	obj.shprog_from_material = false;
 	if(obj.shdata)
 		obj.shdata = new ProgramData(*obj.shdata, obj.shprog);