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(level>=levels)
throw out_of_range("Texture2D::image");
- LinAl::Vector<unsigned, 2> size = get_level_size(level);
-
if(ARB_texture_storage)
+ {
+ LinAl::Vector<unsigned, 2> size = get_level_size(level);
return sub_image(level, 0, 0, size.x, size.y, data);
+ }
+
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(target, id);
+
+ image_(level, data);
+
+ if(auto_gen_mipmap && level==0)
+ {
+ generate_mipmap_();
+ allocated |= (1<<levels)-1;
+ }
- BindRestore _bind(this);
+ 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, 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(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)
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)
texture.generate_id();
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer.get_id());
texture.image(image, 0, true);
+ glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
}
++phase;