throw invalid_operation("Texture3D::allocate");
if(level>=levels)
throw invalid_argument("Texture3D::allocate");
-
- bool direct = ARB_texture_storage && ARB_direct_state_access;
- if(!direct)
- {
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(target, id);
- }
-
- allocate_(level);
-
- if(!direct)
- glBindTexture(target, 0);
-}
-
-void Texture3D::allocate_(unsigned level)
-{
if(allocated&(1<<level))
return;
if(ARB_direct_state_access)
glTextureStorage3D(id, levels, fmt, width, height, depth);
else
+ {
+ bind_scratch();
glTexStorage3D(target, levels, fmt, width, height, depth);
+ }
apply_swizzle();
allocated |= (1<<levels)-1;
}
else
- image_(level, 0);
+ image(level, 0);
}
void Texture3D::image(unsigned level, const void *data)
if(level>=levels)
throw out_of_range("Texture3D::image");
+ LinAl::Vector<unsigned, 3> size = get_level_size(level);
+
if(ARB_texture_storage)
- {
- LinAl::Vector<unsigned, 3> size = get_level_size(level);
return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
- }
-
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(target, id);
-
- image_(level, data);
- if(auto_gen_mipmap && level==0)
- {
- generate_mipmap_();
- allocated |= (1<<levels)-1;
- }
+ bind_scratch();
- glBindTexture(target, 0);
-}
-
-void Texture3D::image_(unsigned level, const void *data)
-{
if(!allocated)
{
glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
apply_swizzle();
}
- LinAl::Vector<unsigned, 3> size = get_level_size(level);
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));
if(level>=levels)
throw out_of_range("Texture3D::sub_image");
- bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
- if(!direct)
- {
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(target, id);
- }
-
- allocate_(level);
+ 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)
glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, comp, type, data);
else
+ {
+ bind_scratch();
glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
-
- if(auto_gen_mipmap && level==0)
- generate_mipmap_();
-
- if(!direct)
- glBindTexture(target, 0);
+ }
}
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)
return LinAl::Vector<unsigned, 3>(w, h, d);
}
-UInt64 Texture3D::get_data_size() const
+uint64_t Texture3D::get_data_size() const
{
return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
}