X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=010609a8e7a098c092524366990a9057efba1986;hb=9087cc0;hp=c107fd7451a16a6f2f9c5368e065d20442249277;hpb=aead6d04308d7873dc99aa4572ce1590a89ebcbd;p=libs%2Fgl.git diff --git a/source/texture3d.cpp b/source/texture3d.cpp index c107fd74..010609a8 100644 --- a/source/texture3d.cpp +++ b/source/texture3d.cpp @@ -60,23 +60,19 @@ void Texture3D::allocate(unsigned level) if(ARB_texture_storage) { + Conditional _bind(!ARB_direct_state_access, this); if(ARB_direct_state_access) glTextureStorage3D(id, levels, ifmt, width, height, depth); else - { - BindRestore _bind(this); glTexStorage3D(target, levels, ifmt, width, height, depth); - } + apply_swizzle(); allocated |= (1< _bind(!ARB_direct_state_access, this); allocate(level); - fmt = get_upload_format(fmt); + comp = get_upload_components(comp); if(ARB_direct_state_access) - glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, fmt, type, data); + glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, comp, type, data); else - glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data); + glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data); if(auto_gen_mipmap && level==0) generate_mipmap(); } -void Texture3D::load_image(const string &fn, int dp) -{ - Graphics::Image img; - img.load_file(fn); - - unsigned w = img.get_width(); - unsigned h = img.get_height(); - unsigned d = 1; - - if(dp==-1) - { - if(h%w) - throw incompatible_data("Texture3D::load_image"); - d = h/w; - h = w; - } - else if(dp==-2) - { - for(d=h; d*d>h; d>>=2) ; - for(; d*d0) - { - d = dp; - if(h%d) - throw incompatible_data("Texture3D::load_image"); - h /= d; - } - else - throw invalid_argument("Texture3D::load_image"); - - PixelFormat fmt = pixelformat_from_graphics(img.get_format()); - if(width==0) - storage(storage_pixelformat_from_graphics(img.get_format()), w, h, d); - else if(w!=width || h!=height || d!=depth) - throw incompatible_data("Texture3D::load_image"); - - PixelStore pstore = PixelStore::from_image(img); - BindRestore _bind_ps(pstore); - - image(0, fmt, UNSIGNED_BYTE, img.get_data()); -} - void Texture3D::image(const Graphics::Image &img, unsigned lv, bool srgb) { unsigned w = img.get_width(); @@ -188,19 +141,18 @@ void Texture3D::image(const Graphics::Image &img, unsigned lv, bool srgb) h = w; } - PixelFormat fmt = pixelformat_from_graphics(img.get_format()); + PixelFormat fmt = pixelformat_from_image(img); + PixelComponents comp = get_components(fmt); + DataType type = get_component_type(fmt); if(width==0) - { - unsigned l = (is_mipmapped(min_filter) ? lv : 1); - storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, l); - } + storage(make_pixelformat(comp, type, srgb), w, h, d, lv); else if(w!=width || h!=height || d!=depth) throw incompatible_data("Texture3D::load_image"); PixelStore pstore = PixelStore::from_image(img); BindRestore _bind_ps(pstore); - image(0, fmt, UNSIGNED_BYTE, img.get_data()); + image(0, comp, type, img.get_data()); } unsigned Texture3D::get_n_levels() const @@ -250,11 +202,12 @@ void Texture3D::Loader::init() { add("raw_data", &Loader::raw_data); add("storage", &Loader::storage); + add("storage", &Loader::storage_levels); } void Texture3D::Loader::raw_data(const string &data) { - obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data()); + obj.image(0, get_components(obj.ifmt), get_component_type(obj.ifmt), data.data()); } void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned d) @@ -262,5 +215,10 @@ void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigne obj.storage(fmt, w, h, d); } +void Texture3D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, unsigned d, unsigned l) +{ + obj.storage(fmt, w, h, d, l); +} + } // namespace GL } // namespace Msp