X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=b8c14792dad403e9fd98e2885dc99188fd17be80;hb=47f817343df1d06d91a4f7c4d5b47df40b24366c;hp=22bdebdfd2a02eca284a0183c29a2f942b7a1631;hpb=7d7a8f9e77a526fd5f2920b9005805e56a4b686c;p=libs%2Fgl.git diff --git a/source/texture.cpp b/source/texture.cpp index 22bdebdf..b8c14792 100644 --- a/source/texture.cpp +++ b/source/texture.cpp @@ -1,9 +1,12 @@ +#include #include +#include #include #include #include -#include +#include #include +#include "bindable.h" #include "error.h" #include "resourcemanager.h" #include "resources.h" @@ -47,21 +50,32 @@ void operator>>(const LexicalConverter &c, TextureWrap &tw) } +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 +}; + Texture::Texture(GLenum t, ResourceManager *m): id(0), target(t), + ifmt(RGB), min_filter(NEAREST_MIPMAP_LINEAR), mag_filter(LINEAR), + max_anisotropy(1.0f), wrap_s(REPEAT), wrap_t(REPEAT), wrap_r(REPEAT), - gen_mipmap(false), + auto_gen_mipmap(false), compare(false), cmp_func(LEQUAL), dirty_params(0) { if(m) set_manager(m); + else if(ARB_direct_state_access) + glCreateTextures(target, 1, &id); else glGenTextures(1, &id); } @@ -75,9 +89,55 @@ Texture::~Texture() glDeleteTextures(1, &id); } +DataType Texture::get_alloc_type(PixelFormat fmt) +{ + return (get_base_pixelformat(fmt)==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE); +} + +void Texture::set_internal_format(PixelFormat fmt) +{ + FormatSwizzle swiz = NO_SWIZZLE; + if(ARB_texture_rg && ARB_texture_swizzle) + { + if(fmt==LUMINANCE) + { + fmt = RED; + swiz = R_TO_LUMINANCE; + } + else if(fmt==LUMINANCE_ALPHA) + { + fmt = RG; + swiz = RG_TO_LUMINANCE_ALPHA; + } + } + + if(!get_component_size(fmt) && OES_required_internalformat) + fmt = get_default_sized_pixelformat(fmt); + + require_pixelformat(fmt); + ifmt = fmt; + swizzle = swiz; + if(swizzle) + update_parameter(FORMAT_SWIZZLE); +} + +PixelFormat Texture::get_upload_format(PixelFormat fmt) const +{ + if(fmt==LUMINANCE || fmt==LUMINANCE_ALPHA) + return get_base_pixelformat(ifmt); + else + return fmt; +} + void Texture::update_parameter(int mask) const { - if(TexUnit::current().get_texture()!=this) + if(!id) + { + dirty_params |= mask; + return; + } + + if(!ARB_direct_state_access && TexUnit::current().get_texture()!=this) { TexUnit *unit = TexUnit::find_unit(this); if(!unit) @@ -90,23 +150,54 @@ void Texture::update_parameter(int mask) const } if(mask&MIN_FILTER) - glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter); + set_parameter_i(GL_TEXTURE_MIN_FILTER, min_filter); if(mask&MAG_FILTER) - glTexParameteri(target, GL_TEXTURE_MAG_FILTER, mag_filter); + set_parameter_i(GL_TEXTURE_MAG_FILTER, mag_filter); if(mask&MAX_ANISOTROPY) - glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy); + set_parameter_f(GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy); if(mask&WRAP_S) - glTexParameteri(target, GL_TEXTURE_WRAP_S, wrap_s); + set_parameter_i(GL_TEXTURE_WRAP_S, wrap_s); if(mask&WRAP_T) - glTexParameteri(target, GL_TEXTURE_WRAP_T, wrap_t); + set_parameter_i(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); + set_parameter_i(GL_TEXTURE_WRAP_R, wrap_r); if(mask&COMPARE) - glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE)); + set_parameter_i(GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE)); if(mask&COMPARE_FUNC) - glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func); + set_parameter_i(GL_TEXTURE_COMPARE_FUNC, cmp_func); + if(mask&FORMAT_SWIZZLE) + { + 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_parameter_f(GLenum param, float value) const +{ + if(ARB_direct_state_access) + glTextureParameterf(id, param, value); + else + glTexParameterf(target, param, value); } void Texture::set_min_filter(TextureFilter f) @@ -134,7 +225,8 @@ void Texture::set_max_anisotropy(float a) else if(a>1.0f) static Require _req(EXT_texture_filter_anisotropic); max_anisotropy = a; - update_parameter(MAX_ANISOTROPY); + if(EXT_texture_filter_anisotropic) + update_parameter(MAX_ANISOTROPY); } void Texture::set_wrap(TextureWrap w) @@ -164,28 +256,37 @@ void Texture::set_wrap_r(TextureWrap w) update_parameter(WRAP_R); } -void Texture::set_generate_mipmap(bool gm) +bool Texture::can_generate_mipmap() { - if(gm) - static Require _req(SGIS_generate_mipmap); - gen_mipmap = gm; - if(get_gl_api()!=OPENGL_ES2) - update_parameter(GENERATE_MIPMAP); + return EXT_framebuffer_object; } -void Texture::auto_generate_mipmap() +void Texture::generate_mipmap() { - if(get_gl_api()==OPENGL_ES2) + // glGenerateMipmap is defined here + static Require _req(EXT_framebuffer_object); + + if(ARB_direct_state_access) + glGenerateTextureMipmap(id); + else { - // glGenerateMipmap is defined here - static Require _req(EXT_framebuffer_object); + 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) { - static Require _req(ARB_shadow); + if(c) + static Require _req(ARB_shadow); compare = c; update_parameter(COMPARE); } @@ -197,6 +298,24 @@ void Texture::set_compare_func(Predicate f) update_parameter(COMPARE_FUNC); } +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 { if(!id) @@ -211,21 +330,18 @@ void Texture::bind_to(unsigned i) const } TexUnit &unit = TexUnit::get_unit(i); - const Texture *old = unit.get_texture(); if(unit.set_texture(this)) { if(manager) manager->resource_used(*this); - unit.bind(); - if(unit.supports_legacy()) + if(ARB_direct_state_access) + glBindTextureUnit(i, id); + else { - if(old && old->target!=target) - glDisable(old->target); - if(!old || old->target!=target) - glEnable(target); + unit.bind(); + glBindTexture(target, id); } - glBindTexture(target, id); if(dirty_params) { @@ -246,10 +362,13 @@ void Texture::unbind_from(unsigned i) const Texture *cur = unit.get_texture(); if(unit.set_texture(0)) { - unit.bind(); - glBindTexture(cur->target, 0); - if(unit.supports_legacy()) - glDisable(cur->target); + if(ARB_direct_state_access) + glBindTextureUnit(i, 0); + else + { + unit.bind(); + glBindTexture(cur->target, 0); + } } } @@ -268,22 +387,42 @@ 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("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); +} + +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); @@ -291,7 +430,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) @@ -309,6 +457,11 @@ void Texture::Loader::min_filter(TextureFilter f) obj.set_min_filter(f); } +void Texture::Loader::mipmap_levels(unsigned l) +{ + levels = l; +} + void Texture::Loader::wrap(TextureWrap w) { obj.set_wrap(w); @@ -329,5 +482,12 @@ void Texture::Loader::wrap_t(TextureWrap w) obj.set_wrap_t(w); } + +bool is_mipmapped(TextureFilter filter) +{ + return (filter==NEAREST_MIPMAP_NEAREST || filter==NEAREST_MIPMAP_LINEAR || + filter==LINEAR_MIPMAP_NEAREST || filter==LINEAR_MIPMAP_LINEAR); +} + } // namespace GL } // namespace Msp