- 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)
-{
- glTextureStorage3D(id, levels, storage_fmt, width, height, depth);
+ glTextureStorage3D(id, levels, fmt, width, height, depth);
- glTexStorage3D(target, levels, storage_fmt, width, height, depth);
+ {
+ bind_scratch();
+ glTexStorage3D(target, levels, fmt, width, height, depth);
+ }
return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
- image_(level, data);
-
- if(auto_gen_mipmap && level==0)
- {
- generate_mipmap_();
- allocated |= (1<<levels)-1;
- }
-
- glBindTexture(target, 0);
-}
-
-void Texture3D::image_(unsigned level, const void *data)
-{
- LinAl::Vector<unsigned, 3> size = get_level_size(level);
- PixelComponents comp = get_components(storage_fmt);
+ GLenum fmt = get_gl_pixelformat(storage_fmt);
+ GLenum comp = get_gl_components(get_components(storage_fmt));
- glTexImage3D(target, level, storage_fmt, size.x, size.y, size.z, 0, comp, type, data);
+ glTexImage3D(target, level, fmt, size.x, size.y, size.z, 0, comp, type, data);
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
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);
glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
}
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)
}
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);
}
return LinAl::Vector<unsigned, 3>(w, h, d);
}