X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture3d.cpp;h=0ee2e800086b2b940e634352be929da5b4cacd27;hb=3efe3bab1c8290bd49a957ebec0ad97e58a35fcf;hp=f6268d697d6d60c00735c6230e6ff6c701eb8b7c;hpb=2b7f8e45e75bec30c1ea27fc0efd8286f67adc3f;p=libs%2Fgl.git diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp index f6268d69..0ee2e800 100644 --- a/source/core/texture3d.cpp +++ b/source/core/texture3d.cpp @@ -1,13 +1,5 @@ #include -#include -#include -#include -#include -#include -#include -#include "bindable.h" #include "error.h" -#include "pixelstore.h" #include "texture3d.h" using namespace std; @@ -15,29 +7,15 @@ using namespace std; namespace Msp { namespace GL { -Texture3D::Texture3D(GLenum t): - Texture(t), - width(0), - height(0), - depth(0), - allocated(0) +Texture3D::Texture3D(unsigned t): + Texture3DBackend(t) { } -Texture3D::Texture3D(): - Texture(GL_TEXTURE_3D), - width(0), - height(0), - depth(0), - allocated(0) -{ - static Require _req(EXT_texture3D); -} - void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv) { if(width>0) { - if(fmt!=format || wd!=width || ht!=height || dp!=depth || (lv && lv!=levels)) + if(fmt!=format || wd!=width || ht!=height || dp!=depth || (lv && lv!=n_levels)) throw incompatible_data("Texture3D::storage"); return; } @@ -48,99 +26,30 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, width = wd; height = ht; depth = dp; - levels = get_n_levels(); + unsigned size = max(width, height); + if(!is_array()) + size = max(size, depth); + n_levels = count_levels(size); 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<=levels) - throw out_of_range("Texture3D::image"); - LinAl::Vector size = get_level_size(level); - - if(ARB_texture_storage) - return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data); - - BindRestore _bind(this); - - if(!allocated) - { - glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1); - apply_swizzle(); - } - - PixelComponents comp = get_components(storage_fmt); - GLenum type = get_gl_type(get_component_type(storage_fmt)); - glTexImage3D(target, level, storage_fmt, size.x, size.y, size.z, 0, comp, type, data); - - allocated |= 1<=levels) + if(level>=n_levels || x>width || x+wd>width || y>height || y+ht>height || z>depth || z+dp>depth) throw out_of_range("Texture3D::sub_image"); - Conditional _bind(!ARB_direct_state_access, this); - allocate(level); - - PixelComponents comp = get_components(storage_fmt); - GLenum type = get_gl_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::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data) -{ - 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); + Texture3DBackend::sub_image(level, x, y, z, wd, ht, dp, data); } void Texture3D::image(const Graphics::Image &img, unsigned lv) @@ -153,31 +62,16 @@ void Texture3D::image(const Graphics::Image &img, unsigned lv) unsigned d = h/w; h = w; - PixelFormat fmt = pixelformat_from_image(img); - storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, d, lv); - - PixelStore pstore = PixelStore::from_image(img); - BindRestore _bind_ps(pstore); - + storage(pixelformat_from_image(img, use_srgb_format), w, h, d, lv); image(0, img.get_pixels()); } -unsigned Texture3D::get_n_levels() const -{ - 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; -} - LinAl::Vector Texture3D::get_level_size(unsigned level) const { unsigned w = width>>level; unsigned h = height>>level; unsigned d = depth; - if(target!=GL_TEXTURE_2D_ARRAY) + if(!is_array()) d >>= level; if(!w && (h || d)) @@ -190,11 +84,6 @@ LinAl::Vector Texture3D::get_level_size(unsigned level) const return LinAl::Vector(w, h, d); } -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) @@ -210,16 +99,10 @@ Texture3D::Loader::Loader(Texture3D &t, Collection &c): 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);