X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;h=3adc511e23ca2640d0ed7e5a4fc6644b50a65c40;hb=a92362ad19b65f66b98e0dc4d034da5e4eb5cf36;hp=3eb48b8b2eb426dafebd1791ab11d4fba09b4c63;hpb=2e7f0e8b226fdeea3306e2e0eef22a8f200ae16b;p=libs%2Fgl.git diff --git a/source/core/texture.cpp b/source/core/texture.cpp index 3eb48b8b..3adc511e 100644 --- a/source/core/texture.cpp +++ b/source/core/texture.cpp @@ -1,13 +1,13 @@ #include #include #include +#include #include #include "bindable.h" #include "error.h" #include "resourcemanager.h" #include "resources.h" #include "texture.h" -#include "texunit.h" using namespace std; @@ -29,20 +29,23 @@ Texture::Texture(GLenum t, ResourceManager *m): storage_fmt(RGB8), swizzle(NO_SWIZZLE), use_srgb_format(false), - auto_gen_mipmap(false), - default_sampler(*this) + auto_gen_mipmap(false) { if(m) set_manager(m); else generate_id(); + + static bool alignment_init = false; + if(!alignment_init) + { + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + alignment_init = true; + } } Texture::~Texture() { - while(TexUnit *unit = TexUnit::find_unit(this)) - unbind_from(unit->get_index()); - if(id) glDeleteTextures(1, &id); } @@ -55,6 +58,11 @@ void Texture::generate_id() glCreateTextures(target, 1, &id); else glGenTextures(1, &id); + +#ifdef DEBUG + if(!debug_name.empty() && KHR_debug) + glObjectLabel(GL_TEXTURE, id, debug_name.size(), debug_name.c_str()); +#endif } void Texture::set_format(PixelFormat fmt) @@ -122,46 +130,6 @@ void Texture::set_parameter_i(GLenum param, int value) const glTexParameteri(target, param, value); } -void Texture::set_min_filter(TextureFilter f) -{ - default_sampler.set_min_filter(f); -} - -void Texture::set_mag_filter(TextureFilter f) -{ - default_sampler.set_mag_filter(f); -} - -void Texture::set_filter(TextureFilter f) -{ - default_sampler.set_filter(f); -} - -void Texture::set_max_anisotropy(float a) -{ - default_sampler.set_max_anisotropy(a); -} - -void Texture::set_wrap(TextureWrap w) -{ - default_sampler.set_wrap(w); -} - -void Texture::set_wrap_s(TextureWrap w) -{ - default_sampler.set_wrap_s(w); -} - -void Texture::set_wrap_t(TextureWrap w) -{ - default_sampler.set_wrap_t(w); -} - -void Texture::set_wrap_r(TextureWrap w) -{ - default_sampler.set_wrap_r(w); -} - bool Texture::can_generate_mipmap() { return EXT_framebuffer_object; @@ -172,13 +140,22 @@ void Texture::generate_mipmap() // glGenerateMipmap is defined here static Require _req(EXT_framebuffer_object); + if(!ARB_direct_state_access) + { + glActiveTexture(GL_TEXTURE0); + glBindTexture(target, id); + } + generate_mipmap_(); + if(!ARB_direct_state_access) + glBindTexture(target, 0); +} + +void Texture::generate_mipmap_() +{ if(ARB_direct_state_access) glGenerateTextureMipmap(id); else - { - BindRestore _bind(this); glGenerateMipmap(target); - } } void Texture::set_auto_generate_mipmap(bool gm) @@ -189,19 +166,6 @@ void Texture::set_auto_generate_mipmap(bool gm) auto_gen_mipmap = gm; } -void Texture::set_compare_enabled(bool c) -{ - if(c) - default_sampler.set_compare(default_sampler.get_compare_function()); - else - default_sampler.disable_compare(); -} - -void Texture::set_compare_func(Predicate f) -{ - default_sampler.set_compare(f); -} - void Texture::load_image(const string &fn, bool) { load_image(fn, 0U); @@ -220,61 +184,15 @@ void Texture::image(const Graphics::Image &img, bool) image(img, 0U); } -void Texture::bind_to(unsigned i) const +void Texture::set_debug_name(const string &name) { - if(!id) - { - if(manager) - manager->resource_used(*this); - if(!id) - { - unbind_from(i); - return; - } - } - - TexUnit &unit = TexUnit::get_unit(i); - const Texture *cur = unit.get_texture(); - if(unit.set_texture(this)) - { - if(manager) - manager->resource_used(*this); - - if(ARB_direct_state_access) - glBindTextureUnit(i, id); - else - { - unit.bind(); - glBindTexture(target, id); - } - - if(!unit.get_sampler() || unit.get_sampler()==&cur->default_sampler) - default_sampler.bind_to(i); - } -} - -const Texture *Texture::current(unsigned i) -{ - return TexUnit::get_unit(i).get_texture(); -} - -void Texture::unbind_from(unsigned i) -{ - TexUnit &unit = TexUnit::get_unit(i); - const Texture *cur = unit.get_texture(); - if(unit.set_texture(0)) - { - if(ARB_direct_state_access) - glBindTextureUnit(i, 0); - else - { - unit.bind(); - glBindTexture(cur->target, 0); - } - - if(unit.get_sampler()==&cur->default_sampler) - Sampler::unbind_from(i); - } +#ifdef DEBUG + debug_name = name; + if(id && KHR_debug) + glObjectLabel(GL_TEXTURE, id, name.size(), name.c_str()); +#else + (void)name; +#endif } @@ -296,27 +214,11 @@ void Texture::Loader::init() add("external_image", &Loader::external_image); add("external_image_srgb", &Loader::external_image_srgb); - add("filter", &Loader::filter); add("generate_mipmap", &Loader::generate_mipmap); add("image_data", &Loader::image_data); - 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("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); -} - -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 string &fn) { RefPtr io = get_collection().open_raw(fn); @@ -345,15 +247,10 @@ void Texture::Loader::external_image_common(const string &fn) { Graphics::Image img; load_external_image(img, fn); - obj.image(img, get_levels()); + obj.image(img, levels); } } -void Texture::Loader::filter(TextureFilter f) -{ - obj.set_filter(f); -} - void Texture::Loader::generate_mipmap(bool gm) { obj.set_auto_generate_mipmap(gm); @@ -361,26 +258,18 @@ void Texture::Loader::generate_mipmap(bool gm) void Texture::Loader::image_data(const string &data) { + if(obj.manager) + { + obj.set_manager(0); + if(!obj.id) + obj.generate_id(); + } + Graphics::Image img; IO::Memory mem(data.data(), data.size()); img.load_io(mem); - obj.image(img, get_levels()); -} - -void Texture::Loader::mag_filter(TextureFilter f) -{ - obj.set_mag_filter(f); -} - -void Texture::Loader::max_anisotropy(float a) -{ - obj.set_max_anisotropy(a); -} - -void Texture::Loader::min_filter(TextureFilter f) -{ - obj.set_min_filter(f); + obj.image(img, levels); } void Texture::Loader::mipmap_levels(unsigned l) @@ -388,31 +277,5 @@ 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); -} - -void Texture::Loader::wrap_r(TextureWrap w) -{ - obj.set_wrap_r(w); -} - -void Texture::Loader::wrap_s(TextureWrap w) -{ - obj.set_wrap_s(w); -} - -void Texture::Loader::wrap_t(TextureWrap w) -{ - obj.set_wrap_t(w); -} -#pragma GCC diagnostic pop - } // namespace GL } // namespace Msp