X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.cpp;h=f6594ab14c7e5143434ac0823c862427c70f2c9d;hp=a7e4898c1edae7d73de8efe9bf425dbb69ccc569;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=a40fc85277dba5c34402a0e703d038efd30cc57b diff --git a/source/texture.cpp b/source/texture.cpp index a7e4898c..f6594ab1 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,60 +14,23 @@ 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, GL_RED, GL_RED, GL_RED, GL_ONE, - GL_RED, GL_RED, GL_RED, GL_GREEN + GL_RED, GL_RED, GL_RED, GL_GREEN, + GL_BLUE, GL_GREEN, GL_RED, GL_ALPHA }; Texture::Texture(GLenum t, ResourceManager *m): id(0), target(t), - ifmt(RGB), - min_filter(NEAREST_MIPMAP_LINEAR), - mag_filter(LINEAR), - mipmap_levels(0), - max_anisotropy(1.0f), - wrap_s(REPEAT), - wrap_t(REPEAT), - wrap_r(REPEAT), + format(RGB8), + storage_fmt(RGB8), + swizzle(NO_SWIZZLE), + use_srgb_format(false), auto_gen_mipmap(false), - compare(false), - cmp_func(LEQUAL), - dirty_params(0) + default_sampler(*this) { if(m) set_manager(m); @@ -90,95 +49,61 @@ Texture::~Texture() glDeleteTextures(1, &id); } -DataType Texture::get_alloc_type(PixelFormat fmt) +void Texture::set_format(PixelFormat fmt) { - return (get_base_pixelformat(fmt)==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE); -} - -void Texture::set_internal_format(PixelFormat fmt) -{ - if(!get_component_size(fmt) && OES_required_internalformat) - fmt = get_default_sized_pixelformat(fmt); - + PixelComponents comp = get_components(fmt); + PixelComponents st_comp = comp; FormatSwizzle swiz = NO_SWIZZLE; - if(ARB_texture_rg && ARB_texture_swizzle) + switch(comp) { - if(fmt==LUMINANCE8) - { - fmt = R8; - swiz = R_TO_LUMINANCE; - } - else if(fmt==LUMINANCE8_ALPHA8) - { - fmt = RG8; - swiz = RG_TO_LUMINANCE_ALPHA; - } + case LUMINANCE: + st_comp = RED; + swiz = R_TO_LUMINANCE; + break; + case LUMINANCE_ALPHA: + st_comp = RG; + swiz = RG_TO_LUMINANCE_ALPHA; + break; + case BGR: + st_comp = RGB; + swiz = RGB_TO_BGR; + break; + case BGRA: + st_comp = RGBA; + swiz = RGB_TO_BGR; + break; + default:; } - require_pixelformat(fmt); - ifmt = fmt; + PixelFormat st_fmt = make_pixelformat(st_comp, get_component_type(fmt)); + require_pixelformat(st_fmt); + if(swiz!=NO_SWIZZLE) + static Require _req(ARB_texture_swizzle); + + format = fmt; + storage_fmt = st_fmt; swizzle = swiz; - if(swizzle) - update_parameter(FORMAT_SWIZZLE); } -PixelFormat Texture::get_upload_format(PixelFormat fmt) const +void Texture::apply_swizzle() { - if(fmt==LUMINANCE || fmt==LUMINANCE_ALPHA) - return get_base_pixelformat(ifmt); - else - return fmt; -} + if(swizzle==NO_SWIZZLE) + return; -void Texture::update_parameter(int mask) const -{ - if(!ARB_direct_state_access && TexUnit::current().get_texture()!=this) + if(get_gl_api()==OPENGL_ES2) { - TexUnit *unit = TexUnit::find_unit(this); - if(!unit) - { - dirty_params |= mask; - return; - } - - unit->bind(); + set_parameter_i(GL_TEXTURE_SWIZZLE_R, swizzle_orders[swizzle*4]); + set_parameter_i(GL_TEXTURE_SWIZZLE_G, swizzle_orders[swizzle*4+1]); + set_parameter_i(GL_TEXTURE_SWIZZLE_B, swizzle_orders[swizzle*4+2]); + set_parameter_i(GL_TEXTURE_SWIZZLE_A, swizzle_orders[swizzle*4+3]); } - - 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) + else { - if(get_gl_api()==OPENGL_ES2) - { - set_parameter_i(GL_TEXTURE_SWIZZLE_R, swizzle_orders[swizzle*4]); - set_parameter_i(GL_TEXTURE_SWIZZLE_G, swizzle_orders[swizzle*4+1]); - set_parameter_i(GL_TEXTURE_SWIZZLE_B, swizzle_orders[swizzle*4+2]); - set_parameter_i(GL_TEXTURE_SWIZZLE_A, swizzle_orders[swizzle*4+3]); - } + if(ARB_direct_state_access) + glTextureParameteriv(id, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4); else - { - if(ARB_direct_state_access) - glTextureParameteriv(id, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4); - else - glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4); - } + glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4); } - if(mask&MIPMAP_LEVELS) - set_parameter_i(GL_TEXTURE_MAX_LEVEL, (mipmap_levels ? mipmap_levels-1 : 1000)); } void Texture::set_parameter_i(GLenum param, int value) const @@ -189,74 +114,44 @@ void Texture::set_parameter_i(GLenum param, int value) const glTexParameteri(target, param, value); } -void Texture::set_parameter_f(GLenum param, float value) const -{ - if(ARB_direct_state_access) - glTextureParameterf(id, param, value); - else - glTexParameterf(target, param, value); -} - 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); -} - -void Texture::set_mipmap_levels(unsigned l) -{ - mipmap_levels = l; - update_parameter(MIPMAP_LEVELS); + 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() @@ -289,24 +184,32 @@ 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) +{ + load_image(fn, 0U); } -void Texture::load_image(const string &fn, bool srgb) +void Texture::load_image(const string &fn, unsigned lv) { Graphics::Image img; img.load_file(fn); - image(img, srgb); + image(img, lv); +} + +void Texture::image(const Graphics::Image &img, bool) +{ + image(img, 0U); } void Texture::bind_to(unsigned i) const @@ -323,6 +226,7 @@ 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) @@ -336,11 +240,8 @@ void Texture::bind_to(unsigned i) const glBindTexture(target, id); } - if(dirty_params) - { - update_parameter(dirty_params); - dirty_params = 0; - } + if(!unit.get_sampler() || unit.get_sampler()==&cur->default_sampler) + default_sampler.bind_to(i); } } @@ -362,6 +263,9 @@ void Texture::unbind_from(unsigned i) unit.bind(); glBindTexture(cur->target, 0); } + + if(unit.get_sampler()==&cur->default_sampler) + Sampler::unbind_from(i); } } @@ -380,12 +284,10 @@ Texture::Loader::Loader(Texture &t, Collection &c): void Texture::Loader::init() { - if(Resources *res = dynamic_cast(coll)) - srgb = res->get_srgb_conversion(); - else - srgb = false; + levels = 0; add("external_image", &Loader::external_image); + add("external_image_srgb", &Loader::external_image); add("filter", &Loader::filter); add("generate_mipmap", &Loader::generate_mipmap); add("image_data", &Loader::image_data); @@ -393,21 +295,50 @@ 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); add("wrap_t", &Loader::wrap_t); } -void Texture::Loader::external_image(const string &fn) +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 std::string &fn) { - Graphics::Image img; RefPtr io = get_collection().open_raw(fn); if(!io) throw IO::file_not_found(fn); img.load_io(*io); +} + +void Texture::Loader::external_image(const string &fn) +{ + obj.use_srgb_format = false; + external_image_common(fn); +} - obj.image(img, srgb); +void Texture::Loader::external_image_srgb(const string &fn) +{ + obj.use_srgb_format = true; + external_image_common(fn); +} + +void Texture::Loader::external_image_common(const string &fn) +{ + if(obj.manager) + obj.manager->set_resource_location(obj, get_collection(), fn); + else + { + Graphics::Image img; + load_external_image(img, fn); + obj.image(img, get_levels()); + } } void Texture::Loader::filter(TextureFilter f) @@ -426,7 +357,7 @@ void Texture::Loader::image_data(const string &data) IO::Memory mem(data.data(), data.size()); img.load_io(mem); - obj.image(img, srgb); + obj.image(img, get_levels()); } void Texture::Loader::mag_filter(TextureFilter f) @@ -446,7 +377,12 @@ void Texture::Loader::min_filter(TextureFilter f) void Texture::Loader::mipmap_levels(unsigned l) { - obj.set_mipmap_levels(l); + levels = l; +} + +void Texture::Loader::sampler() +{ + load_sub(obj.default_sampler); } void Texture::Loader::wrap(TextureWrap w) @@ -468,13 +404,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