X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=b8c14792dad403e9fd98e2885dc99188fd17be80;hb=47f817343df1d06d91a4f7c4d5b47df40b24366c;hp=1b7bdc2297ec3a1be84d95fdcd091b55b59bae20;hpb=0f890ce60a560ba2ccc0719229be304bb597d919;p=libs%2Fgl.git diff --git a/source/texture.cpp b/source/texture.cpp index 1b7bdc22..b8c14792 100644 --- a/source/texture.cpp +++ b/source/texture.cpp @@ -4,9 +4,9 @@ #include #include #include -#include #include #include +#include "bindable.h" #include "error.h" #include "resourcemanager.h" #include "resources.h" @@ -67,7 +67,7 @@ Texture::Texture(GLenum t, ResourceManager *m): wrap_s(REPEAT), wrap_t(REPEAT), wrap_r(REPEAT), - gen_mipmap(false), + auto_gen_mipmap(false), compare(false), cmp_func(LEQUAL), dirty_params(0) @@ -96,24 +96,24 @@ DataType Texture::get_alloc_type(PixelFormat fmt) void Texture::set_internal_format(PixelFormat fmt) { - if(!get_component_size(fmt) && OES_required_internalformat) - fmt = get_default_sized_pixelformat(fmt); - FormatSwizzle swiz = NO_SWIZZLE; if(ARB_texture_rg && ARB_texture_swizzle) { - if(fmt==LUMINANCE8 || fmt==SLUMINANCE8) + if(fmt==LUMINANCE) { - fmt = R8; + fmt = RED; swiz = R_TO_LUMINANCE; } - else if(fmt==LUMINANCE8_ALPHA8 || fmt==SLUMINANCE8_ALPHA8) + else if(fmt==LUMINANCE_ALPHA) { - fmt = RG8; + fmt = RG; swiz = RG_TO_LUMINANCE_ALPHA; } } + if(!get_component_size(fmt) && OES_required_internalformat) + fmt = get_default_sized_pixelformat(fmt); + require_pixelformat(fmt); ifmt = fmt; swizzle = swiz; @@ -131,6 +131,12 @@ PixelFormat Texture::get_upload_format(PixelFormat fmt) const void Texture::update_parameter(int mask) const { + if(!id) + { + dirty_params |= mask; + return; + } + if(!ARB_direct_state_access && TexUnit::current().get_texture()!=this) { TexUnit *unit = TexUnit::find_unit(this); @@ -155,8 +161,6 @@ void Texture::update_parameter(int mask) const set_parameter_i(GL_TEXTURE_WRAP_T, wrap_t); if(mask&WRAP_R) set_parameter_i(GL_TEXTURE_WRAP_R, wrap_r); - if(mask&GENERATE_MIPMAP) - set_parameter_i(GL_GENERATE_MIPMAP, gen_mipmap); if(mask&COMPARE) set_parameter_i(GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE)); if(mask&COMPARE_FUNC) @@ -254,30 +258,31 @@ void Texture::set_wrap_r(TextureWrap w) bool Texture::can_generate_mipmap() { - return (EXT_framebuffer_object || SGIS_generate_mipmap); + return EXT_framebuffer_object; } -void Texture::set_generate_mipmap(bool gm) -{ - if(gm && !EXT_framebuffer_object) - static Require _req(SGIS_generate_mipmap); - gen_mipmap = gm; - if(!EXT_framebuffer_object) - update_parameter(GENERATE_MIPMAP); -} - -void Texture::auto_generate_mipmap() +void Texture::generate_mipmap() { // glGenerateMipmap is defined here - if(EXT_framebuffer_object) + static Require _req(EXT_framebuffer_object); + + if(ARB_direct_state_access) + glGenerateTextureMipmap(id); + else { - if(ARB_direct_state_access) - glGenerateTextureMipmap(id); - else - glGenerateMipmap(target); + BindRestore _bind(this); + glGenerateMipmap(target); } } +void Texture::set_auto_generate_mipmap(bool gm) +{ + if(gm) + static Require _req(EXT_framebuffer_object); + + auto_gen_mipmap = gm; +} + void Texture::set_compare_enabled(bool c) { if(c) @@ -294,14 +299,24 @@ void Texture::set_compare_func(Predicate f) } void Texture::load_image(const string &fn, bool srgb) +{ + load_image(fn, 0, srgb); +} + +void Texture::load_image(const string &fn, unsigned lv, bool srgb) { Graphics::Image img; img.load_file(fn); - image(img, srgb); + image(img, lv, srgb); +} + +void Texture::image(const Graphics::Image &img, bool srgb) +{ + image(img, 0, srgb); } -void Texture::bind_to(unsigned i, bool legacy) const +void Texture::bind_to(unsigned i) const { if(!id) { @@ -315,25 +330,16 @@ void Texture::bind_to(unsigned i, bool legacy) const } TexUnit &unit = TexUnit::get_unit(i); - const Texture *old = unit.get_texture(); - bool old_legacy = unit.get_texture_legacy(); - if(unit.set_texture(this, legacy)) + if(unit.set_texture(this)) { if(manager) manager->resource_used(*this); - if(ARB_direct_state_access && !old_legacy && (!unit.supports_legacy() || !legacy)) + if(ARB_direct_state_access) glBindTextureUnit(i, id); else { unit.bind(); - if(unit.supports_legacy()) - { - if(old && old->target!=target && old_legacy) - glDisable(old->target); - if((!old || old->target!=target) && legacy) - glEnable(target); - } glBindTexture(target, id); } @@ -354,17 +360,14 @@ void Texture::unbind_from(unsigned i) { TexUnit &unit = TexUnit::get_unit(i); const Texture *cur = unit.get_texture(); - bool legacy = unit.get_texture_legacy(); if(unit.set_texture(0)) { - if(ARB_direct_state_access && !legacy) + if(ARB_direct_state_access) glBindTextureUnit(i, 0); else { unit.bind(); glBindTexture(cur->target, 0); - if(unit.supports_legacy() && legacy) - glDisable(cur->target); } } } @@ -384,6 +387,7 @@ Texture::Loader::Loader(Texture &t, Collection &c): void Texture::Loader::init() { + levels = 0; if(Resources *res = dynamic_cast(coll)) srgb = res->get_srgb_conversion(); else @@ -396,19 +400,27 @@ void Texture::Loader::init() 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("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); +} + void Texture::Loader::external_image(const string &fn) { Graphics::Image img; RefPtr io = get_collection().open_raw(fn); + if(!io) + throw IO::file_not_found(fn); img.load_io(*io); - obj.image(img, srgb); + obj.image(img, get_levels(), srgb); } void Texture::Loader::filter(TextureFilter f) @@ -418,7 +430,7 @@ void Texture::Loader::filter(TextureFilter f) void Texture::Loader::generate_mipmap(bool gm) { - obj.set_generate_mipmap(gm); + obj.set_auto_generate_mipmap(gm); } void Texture::Loader::image_data(const string &data) @@ -427,7 +439,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(), srgb); } void Texture::Loader::mag_filter(TextureFilter f) @@ -445,6 +457,11 @@ void Texture::Loader::min_filter(TextureFilter f) obj.set_min_filter(f); } +void Texture::Loader::mipmap_levels(unsigned l) +{ + levels = l; +} + void Texture::Loader::wrap(TextureWrap w) { obj.set_wrap(w);