Texture(t),
width(0),
height(0),
- depth(0),
- allocated(0)
+ depth(0)
{ }
Texture3D::Texture3D():
Texture(GL_TEXTURE_3D),
width(0),
height(0),
- depth(0),
- allocated(0)
+ depth(0)
{
static Require _req(EXT_texture3D);
}
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<<level))
- return;
+ GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
if(ARB_texture_storage)
{
- GLenum fmt = get_gl_pixelformat(storage_fmt);
if(ARB_direct_state_access)
- glTextureStorage3D(id, levels, fmt, width, height, depth);
+ glTextureStorage3D(id, levels, gl_fmt, width, height, depth);
else
{
bind_scratch();
- glTexStorage3D(target, levels, fmt, width, height, depth);
+ glTexStorage3D(target, levels, gl_fmt, width, height, depth);
}
- apply_swizzle();
- allocated |= (1<<levels)-1;
}
else
- image(level, 0);
-}
-
-void Texture3D::image(unsigned level, const void *data)
-{
- if(width==0 || height==0 || depth==0)
- throw invalid_operation("Texture3D::image");
- if(level>=levels)
- throw out_of_range("Texture3D::image");
-
- LinAl::Vector<unsigned, 3> size = get_level_size(level);
-
- if(ARB_texture_storage)
- return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
-
- bind_scratch();
-
- if(!allocated)
{
+ bind_scratch();
+ GLenum comp = get_gl_components(get_components(storage_fmt));
+ GLenum type = get_gl_type(get_component_type(storage_fmt));
+ for(unsigned i=0; i<levels; ++i)
+ {
+ LinAl::Vector<unsigned, 3> lv_size = get_level_size(i);
+ glTexImage3D(target, i, gl_fmt, lv_size.x, lv_size.y, lv_size.z, 0, comp, type, 0);
+ }
glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
- apply_swizzle();
}
- GLenum fmt = get_gl_pixelformat(storage_fmt);
- GLenum comp = get_gl_components(get_components(storage_fmt));
- GLenum type = get_gl_type(get_component_type(storage_fmt));
- glTexImage3D(target, level, fmt, size.x, size.y, size.z, 0, comp, type, data);
+ apply_swizzle();
+}
- allocated |= 1<<level;
+void Texture3D::image(unsigned level, const void *data)
+{
+ LinAl::Vector<unsigned, 3> size = get_level_size(level);
+ return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
}
void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
if(level>=levels)
throw out_of_range("Texture3D::sub_image");
- allocate(level);
-
GLenum comp = get_gl_components(get_components(storage_fmt));
GLenum type = get_gl_type(get_component_type(storage_fmt));
if(ARB_direct_state_access)
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);
-
+ storage(pixelformat_from_image(img, use_srgb_format), w, h, d, lv);
image(0, img.get_pixels());
}