X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=03c58d0afdf05e6273cfbbea2892ea2d7e067ca9;hp=11fcf5263c602cdf895e28ca481036de8dd4fcbe;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8 diff --git a/source/texture3d.cpp b/source/texture3d.cpp index 11fcf526..03c58d0a 100644 --- a/source/texture3d.cpp +++ b/source/texture3d.cpp @@ -1,16 +1,28 @@ #include -#include +#include +#include +#include +#include +#include +#include #include "bindable.h" -#include "except.h" -#include "extension.h" +#include "error.h" +#include "pixelstore.h" #include "texture3d.h" -#include "version_1_2.h" using namespace std; namespace Msp { namespace GL { +Texture3D::Texture3D(GLenum t): + Texture(t), + width(0), + height(0), + depth(0), + allocated(0) +{ } + Texture3D::Texture3D(): Texture(GL_TEXTURE_3D), width(0), @@ -18,106 +30,152 @@ Texture3D::Texture3D(): depth(0), allocated(0) { - static RequireVersion _ver(1, 2); + static Require _req(EXT_texture3D); } -void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d) +void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv) { if(width>0) - throw InvalidState("Textures storage may only be specified once"); - if(w==0 || h==0 || d==0) - throw InvalidParameterValue("Invalid texture dimensions"); - - width = w; - height = h; - depth = d; - ifmt = f; + throw invalid_operation("Texture3D::storage"); + if(wd==0 || ht==0 || dp==0) + throw invalid_argument("Texture3D::storage"); + + set_format(fmt); + width = wd; + height = ht; + depth = dp; + levels = get_n_levels(); + if(lv>0) + levels = min(levels, lv); } void Texture3D::allocate(unsigned level) { + if(width==0 || height==0 || depth==0) + throw invalid_operation("Texture3D::allocate"); + if(level>=levels) + throw invalid_argument("Texture3D::allocate"); if(allocated&(1< _bind(!ARB_direct_state_access, this); + if(ARB_direct_state_access) + glTextureStorage3D(id, levels, storage_fmt, width, height, depth); + else + glTexStorage3D(target, levels, storage_fmt, width, height, depth); + apply_swizzle(); + allocated |= (1<>=1, h>>=1, d>>=1, ++level) ; - allocated |= (1< _bind(!ARB_direct_state_access, this); allocate(level); - Bind _bind(this, true); - glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data); + PixelComponents comp = get_components(storage_fmt); + DataType type = get_component_type(storage_fmt); + if(ARB_direct_state_access) + glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, comp, type, data); + else + 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) +void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data) { - Graphics::Image img; - img.load_file(fn); + if(comp!=get_components(format) || type!=get_component_type(format)) + throw incompatible_data("Texture3D::sub_image"); + sub_image(level, x, y, z, wd, ht, dp, data); +} +void Texture3D::image(const Graphics::Image &img, unsigned lv) +{ unsigned w = img.get_width(); unsigned h = img.get_height(); - unsigned d = 1; - if(dp==-1) - { - if(h%w) - throw IncompatibleData("Image height is not divisible by its width"); - d = h/w; - h = w; - } - else if(dp==-2) - { - for(d=h; d*d>h; d>>=2) ; - for(; d*d0) - d = dp; + if(h%w) + throw incompatible_data("Texture3D::load_image"); + unsigned d = h/w; + h = w; - PixelFormat fmt = pixelformat_from_graphics(img.get_format()); + PixelFormat fmt = pixelformat_from_image(img); if(width==0) - storage(fmt, w, h, d); + storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, d, lv); else if(w!=width || h!=height || d!=depth) - throw IncompatibleData("Image does not match texture storage"); + throw incompatible_data("Texture3D::load_image"); + + PixelStore pstore = PixelStore::from_image(img); + BindRestore _bind_ps(pstore); - image(0, fmt, UNSIGNED_INT, img.get_data()); + image(0, img.get_pixels()); } -void Texture3D::require_storage() +unsigned Texture3D::get_n_levels() const { - if(width==0 || height==0 || depth==0) - throw InvalidState("Texture storage has not been specified"); + unsigned s = max(width, height); + if(target!=GL_TEXTURE_2D_ARRAY) + s = max(s, depth); + unsigned n = 0; + for(; s; s>>=1, ++n) ; + return n; } -void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d) +void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d) const { w >>= level; h >>= level; - d >>= level; + if(target!=GL_TEXTURE_2D_ARRAY) + d >>= level; if(!w && (h || d)) w = 1; @@ -127,5 +185,45 @@ void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigne d = 1; } +UInt64 Texture3D::get_data_size() const +{ + return id ? width*height*depth*get_pixel_size(storage_fmt) : 0; +} + + +Texture3D::Loader::Loader(Texture3D &t): + DataFile::DerivedObjectLoader(t) +{ + init(); +} + +Texture3D::Loader::Loader(Texture3D &t, Collection &c): + DataFile::DerivedObjectLoader(t, c) +{ + init(); +} + +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, data.data()); +} + +void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned d) +{ + 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