void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
{
if(width>0)
- throw invalid_operation("Texture2D::storage");
+ {
+ if(fmt!=format || wd!=width || ht!=height || (lv && lv!=levels))
+ throw incompatible_data("Texture2D::storage");
+ return;
+ }
if(wd==0 || ht==0)
throw invalid_argument("Texture2D::storage");
throw invalid_operation("Texture2D::allocate");
if(level>=levels)
throw invalid_argument("Texture2D::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 Texture2D::allocate_(unsigned level)
+{
if(allocated&(1<<level))
return;
if(ARB_texture_storage)
{
- Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
if(ARB_direct_state_access)
glTextureStorage2D(id, levels, storage_fmt, width, height);
else
allocated |= (1<<levels)-1;
}
else
- image(level, 0);
+ image_(level, 0);
}
void Texture2D::image(unsigned level, const void *data)
{
if(width==0 || height==0)
throw invalid_operation("Texture2D::image");
-
- unsigned w = width;
- unsigned h = height;
- get_level_size(level, w, h);
+ if(level>=levels)
+ throw out_of_range("Texture2D::image");
if(ARB_texture_storage)
- return sub_image(level, 0, 0, w, h, data);
+ {
+ LinAl::Vector<unsigned, 2> size = get_level_size(level);
+ return sub_image(level, 0, 0, size.x, size.y, data);
+ }
- BindRestore _bind(this);
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(target, id);
+ image_(level, data);
+
+ if(auto_gen_mipmap && level==0)
+ {
+ generate_mipmap_();
+ allocated |= (1<<levels)-1;
+ }
+
+ glBindTexture(target, 0);
+}
+
+void Texture2D::image_(unsigned level, const void *data)
+{
if(!allocated)
{
glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
apply_swizzle();
}
+ LinAl::Vector<unsigned, 2> size = get_level_size(level);
PixelComponents comp = get_components(storage_fmt);
GLenum type = get_gl_type(get_component_type(storage_fmt));
- glTexImage2D(target, level, storage_fmt, w, h, 0, comp, type, data);
+ glTexImage2D(target, level, storage_fmt, size.x, size.y, 0, comp, type, data);
allocated |= 1<<level;
- if(auto_gen_mipmap && level==0)
- {
- generate_mipmap();
- allocated |= (1<<levels)-1;
- }
}
void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
{
if(width==0 || height==0)
throw invalid_operation("Texture2D::sub_image");
+ if(level>=levels)
+ throw out_of_range("Texture2D::sub_image");
- Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
- allocate(level);
+ bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
+ if(!direct)
+ {
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(target, id);
+ }
+
+ allocate_(level);
PixelComponents comp = get_components(storage_fmt);
GLenum type = get_gl_type(get_component_type(storage_fmt));
glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
if(auto_gen_mipmap && level==0)
- generate_mipmap();
+ generate_mipmap_();
+
+ if(!direct)
+ glBindTexture(target, 0);
}
void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
unsigned w = img.get_width();
unsigned h = img.get_height();
PixelFormat fmt = pixelformat_from_image(img);
- if(width==0)
- storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
- else if(w!=width || h!=height || (lv && lv!=levels))
- throw incompatible_data("Texture2D::image");
+ storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
PixelStore pstore = PixelStore::from_image(img);
BindRestore _bind_ps(pstore);
return n;
}
-void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const
+LinAl::Vector<unsigned, 2> Texture2D::get_level_size(unsigned level) const
{
- w >>= level;
- h >>= level;
+ unsigned w = width>>level;
+ unsigned h = height>>level;
if(!w && h)
w = 1;
else if(!h && w)
h = 1;
+
+ return LinAl::Vector<unsigned, 2>(w, h);
}
Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)
glDeleteTextures(1, &id);
id = 0;
allocated = 0;
- default_sampler.unload();
}
void Texture2D::Loader::raw_data(const string &data)
{
+ if(obj.manager)
+ {
+ obj.set_manager(0);
+ if(!obj.id)
+ obj.generate_id();
+ }
obj.image(0, data.data());
}
Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
texture(t),
io(i),
- pixel_buffer(PIXEL_UNPACK_BUFFER),
mapped_address(0),
img_loader(Graphics::ImageLoader::open_io(io)),
phase(0)
image.load_into(*img_loader, mapped_address);
else if(phase==3)
{
- Bind _bind_buf(pixel_buffer, PIXEL_UNPACK_BUFFER);
mapped_address = 0;
if(!pixel_buffer.unmap())
{
}
if(!texture.id)
- {
- if(ARB_direct_state_access)
- glCreateTextures(texture.target, 1, &texture.id);
- else
- glGenTextures(1, &texture.id);
- }
+ texture.generate_id();
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer.get_id());
texture.image(image, 0, true);
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
}
++phase;