void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv)
{
if(width>0)
- throw invalid_operation("Texture3D::storage");
+ {
+ if(fmt!=format || wd!=width || ht!=height || dp!=depth || (lv && lv!=levels))
+ throw incompatible_data("Texture3D::storage");
+ return;
+ }
if(wd==0 || ht==0 || dp==0)
throw invalid_argument("Texture3D::storage");
{
if(width==0 || height==0 || depth==0)
throw invalid_operation("Texture3D::image");
+ if(level>=levels)
+ throw out_of_range("Texture3D::image");
- unsigned w = width;
- unsigned h = height;
- unsigned d = depth;
- get_level_size(level, w, h, d);
+ LinAl::Vector<unsigned, 3> size = get_level_size(level);
if(ARB_texture_storage)
- return sub_image(level, 0, 0, 0, w, h, d, data);
+ return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
BindRestore _bind(this);
PixelComponents comp = get_components(storage_fmt);
GLenum type = get_gl_type(get_component_type(storage_fmt));
- glTexImage3D(target, level, storage_fmt, width, height, depth, 0, comp, type, data);
+ glTexImage3D(target, level, storage_fmt, size.x, size.y, size.z, 0, comp, type, data);
allocated |= 1<<level;
if(auto_gen_mipmap && level==0)
void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
{
if(width==0 || height==0 || depth==0)
- throw invalid_operation("Texture3D::image");
+ throw invalid_operation("Texture3D::sub_image");
+ if(level>=levels)
+ throw out_of_range("Texture3D::sub_image");
Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
allocate(level);
h = w;
PixelFormat fmt = pixelformat_from_image(img);
- if(width==0)
- 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 incompatible_data("Texture3D::load_image");
+ 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);
return n;
}
-void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d) const
+LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
{
- w >>= level;
- h >>= level;
+ unsigned w = width>>level;
+ unsigned h = height>>level;
+ unsigned d = depth;
if(target!=GL_TEXTURE_2D_ARRAY)
d >>= level;
h = 1;
if(!d && (w || h))
d = 1;
+
+ return LinAl::Vector<unsigned, 3>(w, h, d);
}
UInt64 Texture3D::get_data_size() const