X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;h=877e4d10c38f6ab60d64fd7166e4e56d5d1f2674;hb=8653af6d620206c1a8bab284721256e9ea4e3b74;hp=155dcae123d1945031c3da3c1b0f068eccc6f007;hpb=3a6eb030fb4eca4c2a317f270704fddf31613130;p=libs%2Fgl.git diff --git a/source/core/texture.cpp b/source/core/texture.cpp index 155dcae1..877e4d10 100644 --- a/source/core/texture.cpp +++ b/source/core/texture.cpp @@ -1,20 +1,19 @@ #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; namespace Msp { namespace GL { -int Texture::swizzle_orders[] = +const int Texture::swizzle_orders[] = { GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, GL_RED, GL_RED, GL_RED, GL_ONE, @@ -22,33 +21,53 @@ int Texture::swizzle_orders[] = GL_BLUE, GL_GREEN, GL_RED, GL_ALPHA }; +Texture *Texture::scratch_binding = 0; + Texture::Texture(GLenum t, ResourceManager *m): id(0), target(t), - format(RGB8), - storage_fmt(RGB8), + format(NO_PIXELFORMAT), + storage_fmt(format), swizzle(NO_SWIZZLE), use_srgb_format(false), - auto_gen_mipmap(false), - default_sampler(*this) + auto_gen_mipmap(false) { if(m) set_manager(m); - else if(ARB_direct_state_access) - glCreateTextures(target, 1, &id); else - glGenTextures(1, &id); + 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(this==scratch_binding) + unbind_scratch(); if(id) glDeleteTextures(1, &id); } +void Texture::generate_id() +{ + if(id) + throw invalid_operation("Texture::generate_id"); + if(ARB_direct_state_access) + 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) { PixelComponents comp = get_components(fmt); @@ -75,7 +94,7 @@ void Texture::set_format(PixelFormat fmt) default:; } - PixelFormat st_fmt = make_pixelformat(st_comp, get_component_type(fmt)); + PixelFormat st_fmt = make_pixelformat(st_comp, get_component_type(fmt), is_srgb(fmt)); require_pixelformat(st_fmt); if(swiz!=NO_SWIZZLE) static Require _req(ARB_texture_swizzle); @@ -114,51 +133,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; -} - void Texture::generate_mipmap() { // glGenerateMipmap is defined here @@ -168,37 +142,11 @@ void Texture::generate_mipmap() glGenerateTextureMipmap(id); else { - BindRestore _bind(this); + bind_scratch(); 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) - 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); -} - void Texture::load_image(const string &fn, unsigned lv) { Graphics::Image img; @@ -207,65 +155,36 @@ void Texture::load_image(const string &fn, unsigned lv) image(img, lv); } -void Texture::image(const Graphics::Image &img, bool) +void Texture::set_debug_name(const string &name) { - image(img, 0U); +#ifdef DEBUG + debug_name = name; + if(id && KHR_debug) + glObjectLabel(GL_TEXTURE, id, name.size(), name.c_str()); +#else + (void)name; +#endif } -void Texture::bind_to(unsigned i) const +void Texture::bind_scratch() { - if(!id) + if(!scratch_binding) + glActiveTexture(GL_TEXTURE0); + if(scratch_binding!=this) { - 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); + if(scratch_binding && scratch_binding->target!=target) + glBindTexture(scratch_binding->target, 0); + glBindTexture(target, id); + scratch_binding = this; } } -const Texture *Texture::current(unsigned i) +void Texture::unbind_scratch() { - 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(scratch_binding) { - 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); + glBindTexture(scratch_binding->target, 0); + scratch_binding = 0; } } @@ -287,28 +206,18 @@ void Texture::Loader::init() levels = 0; add("external_image", &Loader::external_image); - add("external_image_srgb", &Loader::external_image); - add("filter", &Loader::filter); + add("external_image_srgb", &Loader::external_image_srgb); 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 +void Texture::Loader::finish() { - return (is_mipmapped(obj.default_sampler.get_min_filter()) ? levels : 1); + if(obj.auto_gen_mipmap) + obj.generate_mipmap(); } -#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); @@ -337,42 +246,29 @@ 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); + obj.auto_gen_mipmap = 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) @@ -380,31 +276,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