X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=f0c55999250263f641e546341e22b7545177748b;hb=9087cc0;hp=187c2533acbea6fc9e30c33370ffb99ca2a15a18;hpb=57de40e1e802e44ae5b4caa67b0bb8763828b5c3;p=libs%2Fgl.git diff --git a/source/texture.cpp b/source/texture.cpp index 187c2533..f0c55999 100644 --- a/source/texture.cpp +++ b/source/texture.cpp @@ -1,8 +1,8 @@ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include "bindable.h" #include "error.h" #include "resourcemanager.h" #include "resources.h" @@ -14,53 +14,25 @@ using namespace std; namespace Msp { namespace GL { -void operator>>(const LexicalConverter &c, TextureFilter &tf) -{ - if(c.get()=="NEAREST") - tf = NEAREST; - else if(c.get()=="LINEAR") - tf = LINEAR; - else if(c.get()=="NEAREST_MIPMAP_NEAREST") - tf = NEAREST_MIPMAP_NEAREST; - else if(c.get()=="NEAREST_MIPMAP_LINEAR") - tf = NEAREST_MIPMAP_LINEAR; - else if(c.get()=="LINEAR_MIPMAP_NEAREST") - tf = LINEAR_MIPMAP_NEAREST; - else if(c.get()=="LINEAR_MIPMAP_LINEAR") - tf = LINEAR_MIPMAP_LINEAR; - else - throw lexical_error(format("conversion of '%s' to TextureFilter", c.get())); -} - - -void operator>>(const LexicalConverter &c, TextureWrap &tw) +int Texture::swizzle_orders[] = { - if(c.get()=="REPEAT") - tw = REPEAT; - else if(c.get()=="CLAMP_TO_EDGE") - tw = CLAMP_TO_EDGE; - else if(c.get()=="MIRRORED_REPEAT") - tw = MIRRORED_REPEAT; - else - throw lexical_error(format("conversion of '%s' to TextureWrap", c.get())); -} - + GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA, + GL_RED, GL_RED, GL_RED, GL_ONE, + GL_RED, GL_RED, GL_RED, GL_GREEN +}; Texture::Texture(GLenum t, ResourceManager *m): id(0), 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) + ifmt(RGB8), + swizzle(NO_SWIZZLE), + 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); } @@ -74,115 +46,164 @@ Texture::~Texture() glDeleteTextures(1, &id); } -void Texture::update_parameter(int mask) const +void Texture::set_internal_format(PixelFormat fmt) { - if(TexUnit::current().get_texture()!=this) + PixelComponents comp = get_components(fmt); + FormatSwizzle swiz = NO_SWIZZLE; + switch(comp) { - TexUnit *unit = TexUnit::find_unit(this); - if(!unit) - { - dirty_params |= mask; - return; - } + case LUMINANCE: + comp = RED; + swiz = R_TO_LUMINANCE; + break; + case LUMINANCE_ALPHA: + comp = RG; + swiz = RG_TO_LUMINANCE_ALPHA; + break; + default:; + } + + fmt = make_pixelformat(comp, get_component_type(fmt)); + require_pixelformat(fmt); + if(swiz!=NO_SWIZZLE) + static Require _req(ARB_texture_swizzle); + ifmt = fmt; + swizzle = swiz; +} + +PixelComponents Texture::get_upload_components(PixelComponents comp) const +{ + if(comp==LUMINANCE || comp==LUMINANCE_ALPHA) + return get_components(ifmt); + else + return comp; +} + +void Texture::apply_swizzle() +{ + if(swizzle==NO_SWIZZLE) + return; - unit->bind(); + 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); } +} - 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&MAX_ANISOTROPY) - glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy); - 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, gen_mipmap); - if(mask&COMPARE) - glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE)); - if(mask&COMPARE_FUNC) - glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func); +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) { - 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) { - set_min_filter(f); - set_mag_filter(f==NEAREST ? NEAREST : LINEAR); + default_sampler.set_filter(f); } void Texture::set_max_anisotropy(float a) { - if(a<1.0f) - throw invalid_argument("Texture::set_max_anisotropy"); - else if(a>1.0f) - static Require _req(EXT_texture_filter_anisotropic); - max_anisotropy = a; - update_parameter(MAX_ANISOTROPY); + default_sampler.set_max_anisotropy(a); } void Texture::set_wrap(TextureWrap w) { - set_wrap_s(w); - set_wrap_t(w); - if(EXT_texture3D) - 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) { - static Require _req(EXT_texture3D); - wrap_r = w; - update_parameter(WRAP_R); + 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_generate_mipmap(bool gm) +void Texture::set_auto_generate_mipmap(bool gm) { if(gm) - static Require _req(SGIS_generate_mipmap); - gen_mipmap = gm; - update_parameter(GENERATE_MIPMAP); + static Require _req(EXT_framebuffer_object); + + auto_gen_mipmap = gm; } void Texture::set_compare_enabled(bool c) { - static Require _req(ARB_shadow); - 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) { - static Require _req(ARB_shadow); - cmp_func = f; - update_parameter(COMPARE_FUNC); + default_sampler.set_compare(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, lv, srgb); +} + +void Texture::image(const Graphics::Image &img, bool srgb) +{ + image(img, 0, srgb); } void Texture::bind_to(unsigned i) const @@ -199,24 +220,20 @@ void Texture::bind_to(unsigned i) const } TexUnit &unit = TexUnit::get_unit(i); - const Texture *cur = unit.get_texture(); if(unit.set_texture(this)) { if(manager) manager->resource_used(*this); - unit.bind(); - if(cur && cur->target!=target) - glDisable(cur->target); - if(!cur || cur->target!=target) - glEnable(target); - glBindTexture(target, id); - - if(dirty_params) + if(ARB_direct_state_access) + glBindTextureUnit(i, id); + else { - update_parameter(dirty_params); - dirty_params = 0; + unit.bind(); + glBindTexture(target, id); } + + default_sampler.bind_to(i); } } @@ -231,9 +248,13 @@ void Texture::unbind_from(unsigned i) const Texture *cur = unit.get_texture(); if(unit.set_texture(0)) { - unit.bind(); - glBindTexture(cur->target, 0); - glDisable(cur->target); + if(ARB_direct_state_access) + glBindTextureUnit(i, 0); + else + { + unit.bind(); + glBindTexture(cur->target, 0); + } } } @@ -252,22 +273,45 @@ 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 srgb = false; + add("external_image", &Loader::external_image); add("filter", &Loader::filter); - add("max_anisotropy", &Loader::max_anisotropy); 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::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, get_levels(), srgb); +} + void Texture::Loader::filter(TextureFilter f) { obj.set_filter(f); @@ -275,7 +319,16 @@ 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) +{ + Graphics::Image img; + IO::Memory mem(data.data(), data.size()); + img.load_io(mem); + + obj.image(img, get_levels(), srgb); } void Texture::Loader::mag_filter(TextureFilter f) @@ -293,6 +346,16 @@ 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); @@ -312,6 +375,7 @@ void Texture::Loader::wrap_t(TextureWrap w) { obj.set_wrap_t(w); } +#pragma GCC diagnostic pop } // namespace GL } // namespace Msp