void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
{
if(width>0)
void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
{
if(width>0)
+
+ 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(ARB_direct_state_access)
glTextureStorage2D(id, levels, storage_fmt, width, height);
else
if(ARB_direct_state_access)
glTextureStorage2D(id, levels, storage_fmt, width, height);
else
}
void Texture2D::image(unsigned level, const void *data)
{
if(width==0 || height==0)
throw invalid_operation("Texture2D::image");
}
void Texture2D::image(unsigned level, const void *data)
{
if(width==0 || height==0)
throw invalid_operation("Texture2D::image");
- 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);
+ }
+
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(target, id);
+
+ image_(level, data);
+
+ if(auto_gen_mipmap && level==0)
+ {
+ generate_mipmap_();
+ allocated |= (1<<levels)-1;
+ }
- DataType type = get_component_type(storage_fmt);
- glTexImage2D(target, level, storage_fmt, w, h, 0, comp, type, data);
+ GLenum type = get_gl_type(get_component_type(storage_fmt));
+ glTexImage2D(target, level, storage_fmt, size.x, size.y, 0, comp, type, data);
}
void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
}
void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+ if(level>=levels)
+ throw out_of_range("Texture2D::sub_image");
+
+ bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
+ if(!direct)
+ {
+ glActiveTexture(GL_TEXTURE0);
+ glBindTexture(target, id);
+ }
if(ARB_direct_state_access)
glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
else
glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
if(auto_gen_mipmap && level==0)
if(ARB_direct_state_access)
glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
else
glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
if(auto_gen_mipmap && level==0)
}
void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
}
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);
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");
-
- PixelStore pstore = PixelStore::from_image(img);
- BindRestore _bind_ps(pstore);
+ storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
- {
- 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());