X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.cpp;h=f6594ab14c7e5143434ac0823c862427c70f2c9d;hp=eca0334795ad838c109bad4ed0aa06cf3e06577e;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=7e9e15a12fb398798f2719545cc8553354c1e389 diff --git a/source/texture.cpp b/source/texture.cpp index eca03347..f6594ab1 100644 --- a/source/texture.cpp +++ b/source/texture.cpp @@ -1,11 +1,11 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - -#include "except.h" +#include +#include +#include +#include +#include "bindable.h" +#include "error.h" +#include "resourcemanager.h" +#include "resources.h" #include "texture.h" #include "texunit.h" @@ -14,194 +14,350 @@ using namespace std; namespace Msp { namespace GL { -istream &operator>>(istream &in, TextureFilter &tf) -{ - string str; - in>>str; - - if(str=="NEAREST") - tf = NEAREST; - else if(str=="LINEAR") - tf = LINEAR; - else if(str=="NEAREST_MIPMAP_NEAREST") - tf = NEAREST_MIPMAP_NEAREST; - else if(str=="NEAREST_MIPMAP_LINEAR") - tf = NEAREST_MIPMAP_LINEAR; - else if(str=="LINEAR_MIPMAP_NEAREST") - tf = LINEAR_MIPMAP_NEAREST; - else if(str=="LINEAR_MIPMAP_LINEAR") - tf = LINEAR_MIPMAP_LINEAR; +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), + 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 - in.setstate(ios_base::failbit); - - return in; + glGenTextures(1, &id); } - -Texture::Texture(GLenum t): - target(t), - min_filter(NEAREST_MIPMAP_LINEAR), - mag_filter(LINEAR), - wrap_s(REPEAT), - wrap_t(REPEAT), - wrap_r(REPEAT), - gen_mipmap(false), - compare(false), - cmp_func(LEQUAL), - dirty_params(0) +Texture::~Texture() { - glGenTextures(1, &id); + while(TexUnit *unit = TexUnit::find_unit(this)) + unbind_from(unit->get_index()); + + if(id) + glDeleteTextures(1, &id); } -Texture::~Texture() +void Texture::set_format(PixelFormat fmt) { - glDeleteTextures(1, &id); + PixelComponents comp = get_components(fmt); + PixelComponents st_comp = comp; + FormatSwizzle swiz = NO_SWIZZLE; + switch(comp) + { + 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:; + } + + 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; } -void Texture::update_parameter(int mask) const +void Texture::apply_swizzle() { - if(TexUnit::current().get_texture()==this) + 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(mask&MIN_FILTER) - glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter); - if(mask&MAG_FILTER) - glTexParameteri(target, GL_TEXTURE_MAG_FILTER, mag_filter); - if(mask&WRAP_S) - glTexParameteri(target, GL_TEXTURE_WRAP_S, wrap_s); - if(mask&WRAP_T) - glTexParameteri(target, GL_TEXTURE_WRAP_T, wrap_t); - if(mask&WRAP_R) - glTexParameteri(target, GL_TEXTURE_WRAP_R, wrap_r); - if(mask&GENERATE_MIPMAP) - glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, gen_mipmap); - if(mask&COMPARE) - glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE)); - if(mask&cmp_func) - glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func); + 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 - dirty_params |= mask; + glTexParameteri(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) +{ + default_sampler.set_filter(f); +} + +void Texture::set_max_anisotropy(float a) +{ + default_sampler.set_max_anisotropy(a); } void Texture::set_wrap(TextureWrap w) { - set_wrap_s(w); - set_wrap_t(w); - 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) { - wrap_r = w; - update_parameter(WRAP_R); + default_sampler.set_wrap_r(w); } -void Texture::set_generate_mipmap(bool gm) +bool Texture::can_generate_mipmap() { - gen_mipmap = gm; - update_parameter(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) { - compare = c; - update_parameter(COMPARE); + if(c) + default_sampler.set_compare(default_sampler.get_compare_function()); + else + default_sampler.disable_compare(); } void Texture::set_compare_func(Predicate f) { - 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::bind() const +void Texture::load_image(const string &fn, unsigned lv) { - if(!target) - throw InvalidState("Attempt to bind a texture without target (should never happen)"); + Graphics::Image img; + img.load_file(fn); - const Texture *cur = TexUnit::current().get_texture(); - if(cur!=this) + image(img, lv); +} + +void Texture::image(const Graphics::Image &img, bool) +{ + image(img, 0U); +} + +void Texture::bind_to(unsigned i) const +{ + if(!id) { - if(cur && cur->target!=target) - glDisable(cur->target); - if(!cur || cur->target!=target) - glEnable(target); + if(manager) + manager->resource_used(*this); + if(!id) + { + unbind_from(i); + return; + } + } - glBindTexture(target, id); - TexUnit::current().set_texture(this); + TexUnit &unit = TexUnit::get_unit(i); + const Texture *cur = unit.get_texture(); + if(unit.set_texture(this)) + { + if(manager) + manager->resource_used(*this); - if(dirty_params) + if(ARB_direct_state_access) + glBindTextureUnit(i, id); + else { - update_parameter(dirty_params); - dirty_params = 0; + unit.bind(); + glBindTexture(target, id); } + + if(!unit.get_sampler() || unit.get_sampler()==&cur->default_sampler) + default_sampler.bind_to(i); } } -void Texture::bind_to(unsigned i) const +const Texture *Texture::current(unsigned i) { - TexUnit::activate(i); - bind(); + return TexUnit::get_unit(i).get_texture(); } -const Texture *Texture::current() +void Texture::unbind_from(unsigned i) { - return TexUnit::current().get_texture(); + 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); + } } -void Texture::unbind() + +Texture::Loader::Loader(Texture &t): + DataFile::CollectionObjectLoader(t, 0) { - const Texture *cur = TexUnit::current().get_texture(); - if(!cur) - return; + init(); +} - glBindTexture(cur->target, 0); - glDisable(cur->target); - TexUnit::current().set_texture(0); +Texture::Loader::Loader(Texture &t, Collection &c): + DataFile::CollectionObjectLoader(t, &c) +{ + init(); } -void Texture::unbind_from(unsigned i) +void Texture::Loader::init() { - TexUnit::activate(i); - unbind(); + 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); + 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); +} -Texture::Loader::Loader(Texture &t): - DataFile::ObjectLoader(t) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +void Texture::Loader::load_external_image(Graphics::Image &img, const std::string &fn) { - add("min_filter", &Loader::min_filter); - add("mag_filter", &Loader::mag_filter); - add("generate_mipmap", &Loader::generate_mipmap); + RefPtr io = get_collection().open_raw(fn); + if(!io) + throw IO::file_not_found(fn); + img.load_io(*io); } -void Texture::Loader::min_filter(TextureFilter f) +void Texture::Loader::external_image(const string &fn) { - obj.set_min_filter(f); + obj.use_srgb_format = false; + external_image_common(fn); +} + +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) +{ + obj.set_filter(f); +} + +void Texture::Loader::generate_mipmap(bool gm) +{ + obj.set_auto_generate_mipmap(gm); +} + +void Texture::Loader::image_data(const string &data) +{ + 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) @@ -209,10 +365,46 @@ void Texture::Loader::mag_filter(TextureFilter f) obj.set_mag_filter(f); } -void Texture::Loader::generate_mipmap(bool gm) +void Texture::Loader::max_anisotropy(float a) +{ + obj.set_max_anisotropy(a); +} + +void Texture::Loader::min_filter(TextureFilter f) +{ + obj.set_min_filter(f); +} + +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_generate_mipmap(gm); + obj.set_wrap_t(w); } +#pragma GCC diagnostic pop } // namespace GL } // namespace Msp