if(wd==0 || ht==0)
throw invalid_argument("Texture2D::storage");
- set_internal_format(fmt);
+ set_format(fmt);
width = wd;
height = ht;
levels = get_n_levels();
if(ARB_texture_storage)
{
+ Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
if(ARB_direct_state_access)
- glTextureStorage2D(id, levels, ifmt, width, height);
+ glTextureStorage2D(id, levels, storage_fmt, width, height);
else
- {
- BindRestore _bind(this);
- glTexStorage2D(target, levels, ifmt, width, height);
- }
+ glTexStorage2D(target, levels, storage_fmt, width, height);
+ apply_swizzle();
allocated |= (1<<levels)-1;
}
else
- {
- PixelFormat base_fmt = get_base_pixelformat(ifmt);
- image(level, base_fmt, get_alloc_type(base_fmt), 0);
- }
+ image(level, 0);
}
-void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
+void Texture2D::image(unsigned level, const void *data)
{
if(width==0 || height==0)
throw invalid_operation("Texture2D::image");
get_level_size(level, w, h);
if(ARB_texture_storage)
- return sub_image(level, 0, 0, w, h, fmt, type, data);
+ return sub_image(level, 0, 0, w, h, data);
BindRestore _bind(this);
if(!allocated)
+ {
glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
- glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
+ apply_swizzle();
+ }
+
+ PixelComponents comp = get_components(storage_fmt);
+ DataType type = get_component_type(storage_fmt);
+ glTexImage2D(target, level, storage_fmt, w, h, 0, comp, type, data);
allocated |= 1<<level;
if(auto_gen_mipmap && level==0)
}
}
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+{
+ if(comp!=get_components(format) || type!=get_component_type(format))
+ throw incompatible_data("Texture2D::image");
+ image(level, data);
+}
+
+void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
{
if(width==0 || height==0)
throw invalid_operation("Texture2D::sub_image");
Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
allocate(level);
- fmt = get_upload_format(fmt);
+ PixelComponents comp = get_components(storage_fmt);
+ DataType type = get_component_type(storage_fmt);
if(ARB_direct_state_access)
- glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
+ glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
else
- glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+ glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
if(auto_gen_mipmap && level==0)
generate_mipmap();
}
+void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
+{
+ if(comp!=get_components(format) || type!=get_component_type(format))
+ throw incompatible_data("Texture2D::sub_image");
+ sub_image(level, x, y, wd, ht, data);
+}
+
void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb)
{
image(img, lv, srgb, false);
{
unsigned w = img.get_width();
unsigned h = img.get_height();
- PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+ PixelFormat fmt = pixelformat_from_image(img);
if(width==0)
- storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, lv);
+ storage(make_pixelformat(get_components(fmt), get_component_type(fmt), srgb), 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);
- image(0, fmt, UNSIGNED_BYTE, from_buffer ? 0 : img.get_data());
+ image(0, from_buffer ? 0 : img.get_data());
}
unsigned Texture2D::get_n_levels() const
UInt64 Texture2D::get_data_size() const
{
- return id ? width*height*get_pixel_size(ifmt) : 0;
+ return id ? width*height*get_pixel_size(format) : 0;
}
void Texture2D::unload()
glDeleteTextures(1, &id);
id = 0;
allocated = 0;
- // TODO check which params actually need refreshing
- dirty_params = -1;
default_sampler.unload();
}
void Texture2D::Loader::raw_data(const string &data)
{
- obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+ obj.image(0, data.data());
}
void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)