X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresources.cpp;h=fe59860d8cbbcd6ec9017bbdc70d162e8eff669e;hp=c8e61ef8286d0b54c5364286d622985b0ed308f8;hb=4598d28936d3a4772927d1e3a1534f872731b358;hpb=141ebfc5ed84f95edfd0fba0c354336785eb9807

diff --git a/source/resources.cpp b/source/resources.cpp
index c8e61ef8..fe59860d 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -30,6 +30,7 @@ void init_shaderlib(DataFile::BuiltinSource &);
 
 Resources::Resources():
 	default_tex_filter(Texture::can_generate_mipmap() ? LINEAR_MIPMAP_LINEAR : LINEAR),
+	default_tex_anisotropy(1.0f),
 	srgb_conversion(false),
 	resource_manager(0)
 {
@@ -74,6 +75,11 @@ void Resources::set_default_texture_filter(TextureFilter tf)
 	default_tex_filter = tf;
 }
 
+void Resources::set_default_texture_anisotropy(float a)
+{
+	default_tex_anisotropy = a;
+}
+
 void Resources::set_srgb_conversion(bool c)
 {
 	srgb_conversion = c;
@@ -121,6 +127,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 		else
 			tex->set_mag_filter(default_tex_filter);
 		tex->set_min_filter(default_tex_filter);
+		tex->set_max_anisotropy(default_tex_anisotropy);
 
 		if(resource_manager)
 			resource_manager->set_resource_location(*tex, *this, name);
@@ -141,7 +148,7 @@ Program *Resources::create_program(const string &name)
 	if(RefPtr<IO::Seekable> io = open_from_sources(name))
 	{
 		ProgramCompiler compiler;
-		compiler.compile(*io, this);
+		compiler.compile(*io, this, name);
 		RefPtr<Program> program = new Program;
 		compiler.add_shaders(*program);
 		program->link();