X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;h=5f21229fa8abc2d80c3e0029364bb519bd961bee;hp=f6594ab14c7e5143434ac0823c862427c70f2c9d;hb=959efbf61663efd7879070ce0447e02c8a447ce0;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266 diff --git a/source/core/texture.cpp b/source/core/texture.cpp index f6594ab1..5f21229f 100644 --- a/source/core/texture.cpp +++ b/source/core/texture.cpp @@ -1,53 +1,27 @@ -#include -#include -#include +#include #include -#include "bindable.h" #include "error.h" #include "resourcemanager.h" -#include "resources.h" #include "texture.h" -#include "texunit.h" +#include "texture1d.h" +#include "texture2d.h" +#include "texture2darray.h" +#include "texture3d.h" +#include "texturecube.h" using namespace std; namespace Msp { namespace GL { -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_BLUE, GL_GREEN, GL_RED, GL_ALPHA -}; - -Texture::Texture(GLenum t, ResourceManager *m): - id(0), - target(t), - format(RGB8), - storage_fmt(RGB8), +Texture::Texture(unsigned t): + TextureBackend(t), + format(NO_PIXELFORMAT), + storage_fmt(format), swizzle(NO_SWIZZLE), use_srgb_format(false), - auto_gen_mipmap(false), - default_sampler(*this) -{ - if(m) - set_manager(m); - else if(ARB_direct_state_access) - glCreateTextures(target, 1, &id); - else - glGenTextures(1, &id); -} - -Texture::~Texture() -{ - while(TexUnit *unit = TexUnit::find_unit(this)) - unbind_from(unit->get_index()); - - if(id) - glDeleteTextures(1, &id); -} + auto_gen_mipmap(false) +{ } void Texture::set_format(PixelFormat fmt) { @@ -75,130 +49,16 @@ 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); + require_swizzle(); format = fmt; storage_fmt = st_fmt; swizzle = swiz; } -void Texture::apply_swizzle() -{ - if(swizzle==NO_SWIZZLE) - return; - - 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]); - } - 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); - } -} - -void Texture::set_parameter_i(GLenum param, int value) const -{ - if(ARB_direct_state_access) - glTextureParameteri(id, param, value); - else - 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 - static Require _req(EXT_framebuffer_object); - - if(ARB_direct_state_access) - glGenerateTextureMipmap(id); - else - { - 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) - 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,109 +67,43 @@ void Texture::load_image(const string &fn, unsigned lv) image(img, lv); } -void Texture::image(const Graphics::Image &img, bool) -{ - image(img, 0U); -} - -void Texture::bind_to(unsigned i) const -{ - 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) +Texture::GenericLoader::TypeRegistry &Texture::get_texture_registry() { - TexUnit &unit = TexUnit::get_unit(i); - const Texture *cur = unit.get_texture(); - if(unit.set_texture(0)) + static GenericLoader::TypeRegistry registry; + static bool initialized = false; + if(!initialized) { - 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); + initialized = true; + registry.register_type("1d"); + registry.register_type("2d"); + registry.register_type("3d"); + registry.register_type("2d_array"); + registry.register_type("cube"); } + return registry; } -Texture::Loader::Loader(Texture &t): - DataFile::CollectionObjectLoader(t, 0) -{ - init(); -} - -Texture::Loader::Loader(Texture &t, Collection &c): - DataFile::CollectionObjectLoader(t, &c) -{ - init(); -} - -void Texture::Loader::init() +Texture::Loader::Loader(Texture &t, Collection *c): + CollectionObjectLoader(t, c), + levels(0) { - levels = 0; - - add("external_image", &Loader::external_image); - add("external_image_srgb", &Loader::external_image); - add("filter", &Loader::filter); + add("external_data", &Loader::external_data); + add("external_image", &Loader::external_image, false); + add("external_image_srgb", &Loader::external_image, true); 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); + add("raw_data", &Loader::raw_data); } -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 std::string &fn) +void Texture::Loader::load_external_image(Graphics::Image &img, const string &fn) { RefPtr io = get_collection().open_raw(fn); if(!io) @@ -317,62 +111,47 @@ void Texture::Loader::load_external_image(Graphics::Image &img, const std::strin img.load_io(*io); } -void Texture::Loader::external_image(const string &fn) -{ - obj.use_srgb_format = false; - external_image_common(fn); -} - -void Texture::Loader::external_image_srgb(const string &fn) +void Texture::Loader::external_data(const string &fn) { - obj.use_srgb_format = true; - external_image_common(fn); + if(obj.manager) + obj.manager->set_resource_location(obj, get_collection(), fn); + else + { + DataFile::RawData rd; + rd.open_file(get_collection(), fn); + rd.load(); + obj.image(0, rd.get_data()); + } } -void Texture::Loader::external_image_common(const string &fn) +void Texture::Loader::external_image(bool srgb, const string &fn) { + obj.use_srgb_format = srgb; 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()); + 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); + 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 +159,13 @@ 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) +void Texture::Loader::raw_data(const string &data) { - obj.set_wrap_s(w); -} + if(obj.manager) + obj.set_manager(0); -void Texture::Loader::wrap_t(TextureWrap w) -{ - obj.set_wrap_t(w); + obj.image(0, data.data()); } -#pragma GCC diagnostic pop } // namespace GL } // namespace Msp