X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=90e3bb17f11de1c318f6670a28ce61a17a13a88b;hb=73eec11d44a24bac121f1b0d85f20d58005f3545;hp=7ce039acb6df2278ff8c2df8c289e63cfd290820;hpb=a80b074c70ec991f27114efd13686038cf42c493;p=libs%2Fgl.git diff --git a/source/texture.cpp b/source/texture.cpp index 7ce039ac..90e3bb17 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,109 +14,372 @@ 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 +}; + +Texture::Texture(GLenum t, ResourceManager *m): + id(0), + target(t), + ifmt(RGB), + 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 - in.setstate(ios_base::failbit); + glGenTextures(1, &id); +} + +Texture::~Texture() +{ + while(TexUnit *unit = TexUnit::find_unit(this)) + unbind_from(unit->get_index()); - return in; + if(id) + glDeleteTextures(1, &id); } +DataType Texture::get_alloc_type(PixelFormat fmt) +{ + return (get_base_pixelformat(fmt)==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE); +} -void Texture::bind() const +void Texture::set_internal_format(PixelFormat fmt) { - if(!target) - throw InvalidState("Attempt to bind a texture without target"); + swizzle = NO_SWIZZLE; + if(ARB_texture_rg && ARB_texture_swizzle) + { + if(fmt==LUMINANCE) + { + fmt = RED; + swizzle = R_TO_LUMINANCE; + } + else if(fmt==LUMINANCE_ALPHA) + { + fmt = RG; + swizzle = RG_TO_LUMINANCE_ALPHA; + } + } + + if(!get_component_size(fmt) && OES_required_internalformat) + fmt = get_default_sized_pixelformat(fmt); - const Texture *cur=TexUnit::current().get_texture(); - if(cur && cur->target!=target) - glDisable(cur->target); - if(!cur || cur->target!=target) - glEnable(target); - glBindTexture(target, id); - TexUnit::current().set_texture(this); + require_pixelformat(fmt); + ifmt = fmt; } -void Texture::parameter(GLenum param, int value) +PixelFormat Texture::get_upload_format(PixelFormat fmt) const { - maybe_bind(); + if(fmt==LUMINANCE || fmt==LUMINANCE_ALPHA) + return get_base_pixelformat(ifmt); + else + return fmt; +} - glTexParameteri(target, param, value); +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::parameter(GLenum param, float value) +void Texture::set_parameter_i(GLenum param, int value) const { - maybe_bind(); + if(ARB_direct_state_access) + glTextureParameteri(id, param, value); + else + glTexParameteri(target, param, value); +} - glTexParameterf(target, param, value); +void Texture::set_min_filter(TextureFilter f) +{ + default_sampler.set_min_filter(f); } -Texture::~Texture() +void Texture::set_mag_filter(TextureFilter f) { - glDeleteTextures(1, &id); + default_sampler.set_mag_filter(f); } -void Texture::unbind() +void Texture::set_filter(TextureFilter f) { - const Texture *cur=TexUnit::current().get_texture(); - if(!cur) - return; + 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); +} - glBindTexture(cur->target, 0); - glDisable(cur->target); - TexUnit::current().set_texture(0); +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); + } } -Texture::Texture(): - target(0) +void Texture::set_auto_generate_mipmap(bool gm) { - glGenTextures(1, &id); + if(gm) + static Require _req(EXT_framebuffer_object); + + auto_gen_mipmap = gm; } -void Texture::maybe_bind() const +void Texture::set_compare_enabled(bool c) { - if(TexUnit::current().get_texture()!=this) - bind(); + 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 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) + { + if(manager) + manager->resource_used(*this); + if(!id) + { + unbind_from(i); + return; + } + } + + TexUnit &unit = TexUnit::get_unit(i); + 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); + } + + default_sampler.bind_to(i); + } +} + +const Texture *Texture::current(unsigned i) +{ + 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(ARB_direct_state_access) + glBindTextureUnit(i, 0); + else + { + unit.bind(); + glBindTexture(cur->target, 0); + } + } } Texture::Loader::Loader(Texture &t): - tex(t) + DataFile::CollectionObjectLoader(t, 0) { - add("min_filter", &Loader::min_filter); - add("mag_filter", &Loader::mag_filter); + init(); +} + +Texture::Loader::Loader(Texture &t, Collection &c): + DataFile::CollectionObjectLoader(t, &c) +{ + init(); +} + +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("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); } -void Texture::Loader::min_filter(TextureFilter f) +unsigned Texture::Loader::get_levels() const { - tex.set_min_filter(f); + return (is_mipmapped(obj.default_sampler.get_min_filter()) ? levels : 1); } -void Texture::Loader::mag_filter(TextureFilter f) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +void Texture::Loader::external_image(const string &fn) { - tex.set_mag_filter(f); + 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); } void Texture::Loader::generate_mipmap(bool gm) { - tex.parameter(GL_GENERATE_MIPMAP_SGIS, 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) +{ + 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); +} + +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