X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fsampler.cpp;h=ffd7762568f665baf551808558a3231ca8ba93fe;hp=bb37b0747e7d12c732ac4e57234c6b8bc3836344;hb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;hpb=a482029babea3210840d8c62e9df9ece4342b2b9

diff --git a/source/core/sampler.cpp b/source/core/sampler.cpp
index bb37b074..ffd77625 100644
--- a/source/core/sampler.cpp
+++ b/source/core/sampler.cpp
@@ -8,7 +8,6 @@
 #include "error.h"
 #include "sampler.h"
 #include "texture.h"
-#include "texunit.h"
 
 using namespace std;
 
@@ -34,40 +33,42 @@ Sampler::Sampler():
 		glGenSamplers(1, &id);
 }
 
-void Sampler::update_parameter(int mask) const
+void Sampler::update() const
 {
-	if(mask&MIN_FILTER)
+	if(dirty_params&MIN_FILTER)
 		glSamplerParameteri(id, GL_TEXTURE_MIN_FILTER, min_filter);
-	if(mask&MAG_FILTER)
+	if(dirty_params&MAG_FILTER)
 		glSamplerParameteri(id, GL_TEXTURE_MAG_FILTER, mag_filter);
-	if(mask&MAX_ANISOTROPY)
+	if(dirty_params&MAX_ANISOTROPY)
 		glSamplerParameterf(id, GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
-	if(mask&WRAP_S)
+	if(dirty_params&WRAP_S)
 		glSamplerParameteri(id, GL_TEXTURE_WRAP_S, wrap_s);
-	if(mask&WRAP_T)
+	if(dirty_params&WRAP_T)
 		glSamplerParameteri(id, GL_TEXTURE_WRAP_T, wrap_t);
-	if(mask&WRAP_R)
+	if(dirty_params&WRAP_R)
 		glSamplerParameteri(id, GL_TEXTURE_WRAP_R, wrap_r);
-	if(mask&BORDER_COLOR)
+	if(dirty_params&BORDER_COLOR)
 		glSamplerParameterfv(id, GL_TEXTURE_BORDER_COLOR, &border_color.r);
-	if(mask&COMPARE)
+	if(dirty_params&COMPARE)
 	{
 		glSamplerParameteri(id, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
 		if(compare)
 			glSamplerParameteri(id, GL_TEXTURE_COMPARE_FUNC, cmp_func);
 	}
+
+	dirty_params = 0;
 }
 
 void Sampler::set_min_filter(TextureFilter f)
 {
 	min_filter = f;
-	update_parameter(MIN_FILTER);
+	dirty_params |= MIN_FILTER;
 }
 
 void Sampler::set_mag_filter(TextureFilter f)
 {
 	mag_filter = f;
-	update_parameter(MAG_FILTER);
+	dirty_params |= MAG_FILTER;
 }
 
 void Sampler::set_filter(TextureFilter f)
@@ -84,7 +85,7 @@ void Sampler::set_max_anisotropy(float a)
 		static Require _req(EXT_texture_filter_anisotropic);
 	max_anisotropy = a;
 	if(EXT_texture_filter_anisotropic)
-		update_parameter(MAX_ANISOTROPY);
+		dirty_params |= MAX_ANISOTROPY;
 }
 
 void Sampler::set_wrap(TextureWrap w)
@@ -98,32 +99,32 @@ void Sampler::set_wrap(TextureWrap w)
 void Sampler::set_wrap_s(TextureWrap w)
 {
 	wrap_s = w;
-	update_parameter(WRAP_S);
+	dirty_params |= WRAP_S;
 }
 
 void Sampler::set_wrap_t(TextureWrap w)
 {
 	wrap_t = w;
-	update_parameter(WRAP_T);
+	dirty_params |= WRAP_T;
 }
 
 void Sampler::set_wrap_r(TextureWrap w)
 {
 	static Require _req(EXT_texture3D);
 	wrap_r = w;
-	update_parameter(WRAP_R);
+	dirty_params |= WRAP_R;
 }
 
 void Sampler::set_border_color(const Color &c)
 {
 	border_color = c;
-	update_parameter(BORDER_COLOR);
+	dirty_params |= BORDER_COLOR;
 }
 
 void Sampler::disable_compare()
 {
 	compare = false;
-	update_parameter(COMPARE);
+	dirty_params |= COMPARE;
 }
 
 void Sampler::set_compare(Predicate f)
@@ -134,34 +135,6 @@ void Sampler::set_compare(Predicate f)
 	dirty_params |= COMPARE;
 }
 
-void Sampler::bind_to(unsigned i) const
-{
-	TexUnit &unit = TexUnit::get_unit(i);
-
-	if(unit.set_sampler(this))
-	{
-		glBindSampler(i, id);
-
-		if(dirty_params)
-		{
-			update_parameter(dirty_params);
-			dirty_params = 0;
-		}
-	}
-}
-
-const Sampler *Sampler::current(unsigned i)
-{
-	return TexUnit::get_unit(i).get_sampler();
-}
-
-void Sampler::unbind_from(unsigned i)
-{
-	TexUnit &unit = TexUnit::get_unit(i);
-	if(unit.set_sampler(0))
-		glBindSampler(i, 0);
-}
-
 void Sampler::set_debug_name(const string &name)
 {
 #ifdef DEBUG