X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;h=ea503ed1f9d4414f28f200c89be286fdc49f6190;hp=967a7fe31562d8509619b3bef3d060c3bd75d714;hb=dbc91b65728ab9c0e574bb1127cfe4d2da55de7f;hpb=f1244e29afd2a36aafc2373d485457b4cb0411ff

diff --git a/source/core/texture.cpp b/source/core/texture.cpp
index 967a7fe3..ea503ed1 100644
--- a/source/core/texture.cpp
+++ b/source/core/texture.cpp
@@ -30,8 +30,7 @@ Texture::Texture(GLenum t, ResourceManager *m):
 	storage_fmt(RGB8),
 	swizzle(NO_SWIZZLE),
 	use_srgb_format(false),
-	auto_gen_mipmap(false),
-	default_sampler(*this)
+	auto_gen_mipmap(false)
 {
 	if(m)
 		set_manager(m);
@@ -128,46 +127,6 @@ void Texture::set_parameter_i(GLenum param, int value) const
 		glTexParameteri(target, param, value);
 }
 
-void Texture::set_min_filter(TextureFilter f)
-{
-	default_sampler.set_min_filter(f);
-}
-
-void Texture::set_mag_filter(TextureFilter f)
-{
-	default_sampler.set_mag_filter(f);
-}
-
-void Texture::set_filter(TextureFilter f)
-{
-	default_sampler.set_filter(f);
-}
-
-void Texture::set_max_anisotropy(float a)
-{
-	default_sampler.set_max_anisotropy(a);
-}
-
-void Texture::set_wrap(TextureWrap w)
-{
-	default_sampler.set_wrap(w);
-}
-
-void Texture::set_wrap_s(TextureWrap w)
-{
-	default_sampler.set_wrap_s(w);
-}
-
-void Texture::set_wrap_t(TextureWrap w)
-{
-	default_sampler.set_wrap_t(w);
-}
-
-void Texture::set_wrap_r(TextureWrap w)
-{
-	default_sampler.set_wrap_r(w);
-}
-
 bool Texture::can_generate_mipmap()
 {
 	return EXT_framebuffer_object;
@@ -195,19 +154,6 @@ void Texture::set_auto_generate_mipmap(bool gm)
 	auto_gen_mipmap = gm;
 }
 
-void Texture::set_compare_enabled(bool c)
-{
-	if(c)
-		default_sampler.set_compare(default_sampler.get_compare_function());
-	else
-		default_sampler.disable_compare();
-}
-
-void Texture::set_compare_func(Predicate f)
-{
-	default_sampler.set_compare(f);
-}
-
 void Texture::load_image(const string &fn, bool)
 {
 	load_image(fn, 0U);
@@ -240,7 +186,6 @@ void Texture::bind_to(unsigned i) const
 	}
 
 	TexUnit &unit = TexUnit::get_unit(i);
-	const Texture *cur = unit.get_texture();
 	if(unit.set_texture(this))
 	{
 		if(manager)
@@ -253,9 +198,6 @@ void Texture::bind_to(unsigned i) const
 			unit.bind();
 			glBindTexture(target, id);
 		}
-
-		if(!unit.get_sampler() || unit.get_sampler()==&cur->default_sampler)
-			default_sampler.bind_to(i);
 	}
 }
 
@@ -277,9 +219,6 @@ void Texture::unbind_from(unsigned i)
 			unit.bind();
 			glBindTexture(cur->target, 0);
 		}
-
-		if(unit.get_sampler()==&cur->default_sampler)
-			Sampler::unbind_from(i);
 	}
 }
 
@@ -313,27 +252,11 @@ void Texture::Loader::init()
 
 	add("external_image", &Loader::external_image);
 	add("external_image_srgb", &Loader::external_image_srgb);
-	add("filter", &Loader::filter);
 	add("generate_mipmap", &Loader::generate_mipmap);
 	add("image_data", &Loader::image_data);
-	add("mag_filter", &Loader::mag_filter);
-	add("max_anisotropy", &Loader::max_anisotropy);
-	add("min_filter", &Loader::min_filter);
 	add("mipmap_levels", &Loader::mipmap_levels);
-	add("sampler",    &Loader::sampler);
-	add("wrap",       &Loader::wrap);
-	add("wrap_r",     &Loader::wrap_r);
-	add("wrap_s",     &Loader::wrap_s);
-	add("wrap_t",     &Loader::wrap_t);
-}
-
-unsigned Texture::Loader::get_levels() const
-{
-	return (is_mipmapped(obj.default_sampler.get_min_filter()) ? levels : 1);
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 void Texture::Loader::load_external_image(Graphics::Image &img, const string &fn)
 {
 	RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
@@ -362,15 +285,10 @@ void Texture::Loader::external_image_common(const string &fn)
 	{
 		Graphics::Image img;
 		load_external_image(img, fn);
-		obj.image(img, get_levels());
+		obj.image(img, levels);
 	}
 }
 
-void Texture::Loader::filter(TextureFilter f)
-{
-	obj.set_filter(f);
-}
-
 void Texture::Loader::generate_mipmap(bool gm)
 {
 	obj.set_auto_generate_mipmap(gm);
@@ -389,22 +307,7 @@ void Texture::Loader::image_data(const string &data)
 	IO::Memory mem(data.data(), data.size());
 	img.load_io(mem);
 
-	obj.image(img, get_levels());
-}
-
-void Texture::Loader::mag_filter(TextureFilter f)
-{
-	obj.set_mag_filter(f);
-}
-
-void Texture::Loader::max_anisotropy(float a)
-{
-	obj.set_max_anisotropy(a);
-}
-
-void Texture::Loader::min_filter(TextureFilter f)
-{
-	obj.set_min_filter(f);
+	obj.image(img, levels);
 }
 
 void Texture::Loader::mipmap_levels(unsigned l)
@@ -412,31 +315,5 @@ void Texture::Loader::mipmap_levels(unsigned l)
 	levels = l;
 }
 
-void Texture::Loader::sampler()
-{
-	load_sub(obj.default_sampler);
-}
-
-void Texture::Loader::wrap(TextureWrap w)
-{
-	obj.set_wrap(w);
-}
-
-void Texture::Loader::wrap_r(TextureWrap w)
-{
-	obj.set_wrap_r(w);
-}
-
-void Texture::Loader::wrap_s(TextureWrap w)
-{
-	obj.set_wrap_s(w);
-}
-
-void Texture::Loader::wrap_t(TextureWrap w)
-{
-	obj.set_wrap_t(w);
-}
-#pragma GCC diagnostic pop
-
 } // namespace GL
 } // namespace Msp