X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=7983cfb50e5c4272f76c2ceb9e1c3a5628639635;hb=78840e775c62c1b6e3f550bf8be1f0b828df91aa;hp=b8c14792dad403e9fd98e2885dc99188fd17be80;hpb=47f817343df1d06d91a4f7c4d5b47df40b24366c;p=libs%2Fgl.git diff --git a/source/texture.cpp b/source/texture.cpp index b8c14792..7983cfb5 100644 --- a/source/texture.cpp +++ b/source/texture.cpp @@ -1,11 +1,7 @@ #include -#include #include #include -#include -#include #include -#include #include "bindable.h" #include "error.h" #include "resourcemanager.h" @@ -18,38 +14,6 @@ using namespace std; namespace Msp { namespace GL { -void operator>>(const LexicalConverter &c, TextureFilter &tf) -{ - if(c.get()=="NEAREST") - tf = NEAREST; - else if(c.get()=="LINEAR") - tf = LINEAR; - else if(c.get()=="NEAREST_MIPMAP_NEAREST") - tf = NEAREST_MIPMAP_NEAREST; - else if(c.get()=="NEAREST_MIPMAP_LINEAR") - tf = NEAREST_MIPMAP_LINEAR; - else if(c.get()=="LINEAR_MIPMAP_NEAREST") - tf = LINEAR_MIPMAP_NEAREST; - else if(c.get()=="LINEAR_MIPMAP_LINEAR") - tf = LINEAR_MIPMAP_LINEAR; - else - throw lexical_error(format("conversion of '%s' to TextureFilter", c.get())); -} - - -void operator>>(const LexicalConverter &c, TextureWrap &tw) -{ - if(c.get()=="REPEAT") - tw = REPEAT; - else if(c.get()=="CLAMP_TO_EDGE") - tw = CLAMP_TO_EDGE; - else if(c.get()=="MIRRORED_REPEAT") - tw = MIRRORED_REPEAT; - else - throw lexical_error(format("conversion of '%s' to TextureWrap", c.get())); -} - - int Texture::swizzle_orders[] = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, @@ -61,16 +25,9 @@ Texture::Texture(GLenum t, ResourceManager *m): id(0), target(t), ifmt(RGB), - min_filter(NEAREST_MIPMAP_LINEAR), - mag_filter(LINEAR), - max_anisotropy(1.0f), - wrap_s(REPEAT), - wrap_t(REPEAT), - wrap_r(REPEAT), auto_gen_mipmap(false), - compare(false), - cmp_func(LEQUAL), - dirty_params(0) + dirty_params(0), + default_sampler(*this) { if(m) set_manager(m); @@ -149,22 +106,6 @@ void Texture::update_parameter(int mask) const 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(mask&COMPARE_FUNC) - set_parameter_i(GL_TEXTURE_COMPARE_FUNC, cmp_func); if(mask&FORMAT_SWIZZLE) { if(get_gl_api()==OPENGL_ES2) @@ -202,58 +143,42 @@ void Texture::set_parameter_f(GLenum param, float value) const void Texture::set_min_filter(TextureFilter f) { - min_filter = f; - update_parameter(MIN_FILTER); + default_sampler.set_min_filter(f); } void Texture::set_mag_filter(TextureFilter f) { - mag_filter = f; - update_parameter(MAG_FILTER); + default_sampler.set_mag_filter(f); } void Texture::set_filter(TextureFilter f) { - set_min_filter(f); - set_mag_filter(f==NEAREST ? NEAREST : LINEAR); + default_sampler.set_filter(f); } void Texture::set_max_anisotropy(float a) { - if(a<1.0f) - throw invalid_argument("Texture::set_max_anisotropy"); - else if(a>1.0f) - static Require _req(EXT_texture_filter_anisotropic); - max_anisotropy = a; - if(EXT_texture_filter_anisotropic) - update_parameter(MAX_ANISOTROPY); + default_sampler.set_max_anisotropy(a); } void Texture::set_wrap(TextureWrap w) { - set_wrap_s(w); - set_wrap_t(w); - if(EXT_texture3D) - set_wrap_r(w); + default_sampler.set_wrap(w); } void Texture::set_wrap_s(TextureWrap w) { - wrap_s = w; - update_parameter(WRAP_S); + default_sampler.set_wrap_s(w); } void Texture::set_wrap_t(TextureWrap w) { - wrap_t = w; - update_parameter(WRAP_T); + default_sampler.set_wrap_t(w); } void Texture::set_wrap_r(TextureWrap w) { - static Require _req(EXT_texture3D); - wrap_r = w; - update_parameter(WRAP_R); + default_sampler.set_wrap_r(w); } bool Texture::can_generate_mipmap() @@ -286,16 +211,14 @@ void Texture::set_auto_generate_mipmap(bool gm) void Texture::set_compare_enabled(bool c) { if(c) - static Require _req(ARB_shadow); - compare = c; - update_parameter(COMPARE); + default_sampler.set_compare(default_sampler.get_compare_function()); + else + default_sampler.disable_compare(); } void Texture::set_compare_func(Predicate f) { - static Require _req(ARB_shadow); - cmp_func = f; - update_parameter(COMPARE_FUNC); + default_sampler.set_compare(f); } void Texture::load_image(const string &fn, bool srgb) @@ -348,6 +271,8 @@ void Texture::bind_to(unsigned i) const update_parameter(dirty_params); dirty_params = 0; } + + default_sampler.bind_to(i); } } @@ -401,6 +326,7 @@ void Texture::Loader::init() 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); @@ -412,6 +338,8 @@ 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::external_image(const string &fn) { Graphics::Image img; @@ -462,6 +390,11 @@ 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); @@ -481,13 +414,7 @@ void Texture::Loader::wrap_t(TextureWrap w) { obj.set_wrap_t(w); } - - -bool is_mipmapped(TextureFilter filter) -{ - return (filter==NEAREST_MIPMAP_NEAREST || filter==NEAREST_MIPMAP_LINEAR || - filter==LINEAR_MIPMAP_NEAREST || filter==LINEAR_MIPMAP_LINEAR); -} +#pragma GCC diagnostic pop } // namespace GL } // namespace Msp