]> git.tdb.fi Git - libs/gl.git/blobdiff - source/core/sampler.cpp
Check the flat qualifier from the correct member
[libs/gl.git] / source / core / sampler.cpp
index 5375d17dfc5072d9108334b1627e930449da5e4d..4da13833330dac12eace04b145f9ffacd4a0510b 100644 (file)
-#include <msp/gl/extensions/arb_direct_state_access.h>
-#include <msp/gl/extensions/arb_sampler_objects.h>
-#include <msp/gl/extensions/arb_shadow.h>
-#include <msp/gl/extensions/ext_texture_filter_anisotropic.h>
-#include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/strings/format.h>
+#include "device.h"
 #include "error.h"
 #include "sampler.h"
-#include "texture.h"
-#include "texunit.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Sampler::Sampler():
-       owner(0)
+void Sampler::update() const
 {
-       init();
-
-       Require _req(ARB_sampler_objects);
-       if(ARB_direct_state_access)
-               glCreateSamplers(1, &id);
-       else
-               glGenSamplers(1, &id);
-}
-
-Sampler::Sampler(const Texture &tex):
-       id(0),
-       owner(&tex)
-{
-       if(this!=&tex.get_default_sampler())
-               throw invalid_argument("Sampler::Sampler");
-
-       init();
-}
-
-void Sampler::init()
-{
-       min_filter = NEAREST_MIPMAP_LINEAR;
-       mag_filter = LINEAR;
-       max_anisotropy = 1.0f;
-       wrap_s = REPEAT;
-       wrap_t = REPEAT;
-       wrap_r = REPEAT;
-       compare = false;
-       cmp_func = LEQUAL;
+       SamplerBackend::update(dirty_params);
        dirty_params = 0;
 }
 
-void Sampler::update_parameter(int mask) const
-{
-       if(owner)
-       {
-               if(!owner->get_id())
-               {
-                       dirty_params |= mask;
-                       return;
-               }
-
-               if(!ARB_direct_state_access && TexUnit::current().get_texture()!=owner)
-               {
-                       TexUnit *unit = TexUnit::find_unit(owner);
-                       if(!unit)
-                       {
-                               dirty_params |= mask;
-                               return;
-                       }
-
-                       unit->bind();
-               }
-       }
-
-       if(mask&MIN_FILTER)
-               set_parameter_i(GL_TEXTURE_MIN_FILTER, min_filter);
-       if(mask&MAG_FILTER)
-               set_parameter_i(GL_TEXTURE_MAG_FILTER, mag_filter);
-       if(mask&MAX_ANISOTROPY)
-               set_parameter_f(GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
-       if(mask&WRAP_S)
-               set_parameter_i(GL_TEXTURE_WRAP_S, wrap_s);
-       if(mask&WRAP_T)
-               set_parameter_i(GL_TEXTURE_WRAP_T, wrap_t);
-       if(mask&WRAP_R)
-               set_parameter_i(GL_TEXTURE_WRAP_R, wrap_r);
-       if(mask&COMPARE)
-       {
-               set_parameter_i(GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
-               if(compare)
-                       set_parameter_i(GL_TEXTURE_COMPARE_FUNC, cmp_func);
-       }
-}
-
-void Sampler::set_parameter_i(unsigned param, int value) const
-{
-       if(id)
-               glSamplerParameteri(id, param, value);
-       else if(ARB_direct_state_access)
-               glTextureParameteri(owner->get_id(), param, value);
-       else
-               glTexParameteri(owner->get_target(), param, value);
-}
-
-void Sampler::set_parameter_f(unsigned param, float value) const
-{
-       if(id)
-               glSamplerParameterf(id, param, value);
-       else if(ARB_direct_state_access)
-               glTextureParameterf(owner->get_id(), param, value);
-       else
-               glTexParameterf(owner->get_target(), param, value);
-}
-
 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)
 {
+       if(is_mipmapped(f))
+               throw invalid_argument("Sampler::set_mag_filter");
        mag_filter = f;
-       update_parameter(MAG_FILTER);
+       dirty_params |= MAG_FILTER;
 }
 
 void Sampler::set_filter(TextureFilter f)
@@ -134,112 +38,64 @@ void Sampler::set_max_anisotropy(float a)
 {
        if(a<1.0f)
                throw invalid_argument("Sampler::set_max_anisotropy");
-       else if(a>1.0f)
-               static Require _req(EXT_texture_filter_anisotropic);
+       if(a>Device::get_current().get_info().limits.max_anisotropy)
+               throw out_of_range("Sampler::set_max_anisotropy");
+       bool supported = check_anisotropic(a>1.0f);
        max_anisotropy = a;
-       if(EXT_texture_filter_anisotropic)
-               update_parameter(MAX_ANISOTROPY);
-}
-
-void Sampler::set_wrap(TextureWrap w)
-{
-       set_wrap_s(w);
-       set_wrap_t(w);
-       if(EXT_texture3D)
-               set_wrap_r(w);
+       if(supported)
+               dirty_params |= MAX_ANISOTROPY;
 }
 
 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::disable_compare()
-{
-       compare = false;
-       update_parameter(COMPARE);
-}
-
-void Sampler::set_compare(Predicate f)
-{
-       static Require _req(ARB_shadow);
-       compare = true;
-       cmp_func = f;
-       update_parameter(COMPARE);
-}
-
-void Sampler::bind_to(unsigned i) const
+void Sampler::set_wrap(TextureWrap w)
 {
-       TexUnit &unit = TexUnit::get_unit(i);
-       if(owner && owner!=unit.get_texture())
-               throw invalid_operation("Sampler::bind_to");
-
-       const Sampler *cur = unit.get_sampler();
-       if(unit.set_sampler(this))
-       {
-               if(!owner || (cur && cur->id))
-                       glBindSampler(i, id);
-
-               if(dirty_params)
-               {
-                       update_parameter(dirty_params);
-                       dirty_params = 0;
-               }
-       }
+       set_wrap_s(w);
+       set_wrap_t(w);
+       set_wrap_r(w);
 }
 
-const Sampler *Sampler::current(unsigned i)
+void Sampler::set_border_color(const Color &c)
 {
-       return TexUnit::get_unit(i).get_sampler();
+       border_color = c;
+       dirty_params |= BORDER_COLOR;
 }
 
-void Sampler::unbind_from(unsigned i)
+void Sampler::disable_compare()
 {
-       TexUnit &unit = TexUnit::get_unit(i);
-       const Sampler *cur = unit.get_sampler();
-       if(unit.set_sampler(0) && cur->id)
-               glBindSampler(i, 0);
+       compare = false;
+       dirty_params |= COMPARE;
 }
 
-void Sampler::unload()
+void Sampler::set_compare(Predicate f)
 {
-       if(owner && !owner->get_id())
-       {
-               if(min_filter!=NEAREST_MIPMAP_LINEAR)
-                       dirty_params |= MIN_FILTER;
-               if(mag_filter!=LINEAR)
-                       dirty_params |= MAG_FILTER;
-               if(max_anisotropy!=1.0f)
-                       dirty_params |= MAX_ANISOTROPY;
-               if(wrap_s!=REPEAT)
-                       dirty_params |= WRAP_S;
-               if(wrap_t!=REPEAT)
-                       dirty_params |= WRAP_T;
-               if(wrap_r!=REPEAT)
-                       dirty_params |= WRAP_R;
-               if(compare || cmp_func!=LEQUAL)
-                       dirty_params |= COMPARE;
-       }
+       compare = true;
+       cmp_func = f;
+       dirty_params |= COMPARE;
 }
 
 
 Sampler::Loader::Loader(Sampler &s):
        DataFile::ObjectLoader<Sampler>(s)
 {
+       add("border_color", &Loader::border_color);
+       add("compare", &Loader::compare);
        add("filter", &Loader::filter);
        add("mag_filter", &Loader::mag_filter);
        add("max_anisotropy", &Loader::max_anisotropy);
@@ -250,6 +106,16 @@ Sampler::Loader::Loader(Sampler &s):
        add("wrap_t", &Loader::wrap_t);
 }
 
+void Sampler::Loader::border_color(float r, float g, float b, float a)
+{
+       obj.set_border_color(Color(r, g, b, a));
+}
+
+void Sampler::Loader::compare(Predicate c)
+{
+       obj.set_compare(c);
+}
+
 void Sampler::Loader::filter(TextureFilter f)
 {
        obj.set_filter(f);
@@ -321,6 +187,8 @@ void operator>>(const LexicalConverter &c, TextureWrap &tw)
                tw = REPEAT;
        else if(c.get()=="CLAMP_TO_EDGE")
                tw = CLAMP_TO_EDGE;
+       else if(c.get()=="CLAMP_TO_BORDER")
+               tw = CLAMP_TO_BORDER;
        else if(c.get()=="MIRRORED_REPEAT")
                tw = MIRRORED_REPEAT;
        else