if(wd==0)
throw invalid_argument("Texture1D::storage");
- set_internal_format(fmt);
+ set_format(fmt);
width = wd;
levels = get_n_levels();
if(lv)
{
Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
if(ARB_direct_state_access)
- glTextureStorage1D(id, levels, ifmt, width);
+ glTextureStorage1D(id, levels, storage_fmt, width);
else
- glTexStorage1D(target, levels, ifmt, width);
+ glTexStorage1D(target, levels, storage_fmt, width);
apply_swizzle();
allocated |= (1<<levels)-1;
}
else
- image(level, get_components(ifmt), get_component_type(ifmt), 0);
+ image(level, 0);
}
-void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+void Texture1D::image(unsigned level, const void *data)
{
if(width==0)
throw invalid_operation("Texture1D::image");
unsigned w = get_level_size(level);
if(ARB_texture_storage)
- return sub_image(level, 0, w, comp, type, data);
+ return sub_image(level, 0, w, data);
BindRestore _bind(this);
glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
apply_swizzle();
}
- glTexImage1D(target, level, ifmt, w, 0, get_upload_components(comp), type, data);
+
+ PixelComponents comp = get_components(storage_fmt);
+ DataType type = get_component_type(storage_fmt);
+ glTexImage1D(target, level, storage_fmt, w, 0, comp, type, data);
allocated |= 1<<level;
if(auto_gen_mipmap && level==0)
}
}
-void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelComponents comp, DataType type, const void *data)
+void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+{
+ if(comp!=get_components(format) || type!=get_component_type(format))
+ throw incompatible_data("Texture1D::image");
+ image(level, data);
+}
+
+void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
{
if(width==0)
throw invalid_operation("Texture3D::image");
Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
allocate(level);
- comp = get_upload_components(comp);
+ PixelComponents comp = get_components(storage_fmt);
+ DataType type = get_component_type(storage_fmt);
if(ARB_direct_state_access)
glTextureSubImage1D(id, level, x, wd, comp, type, data);
else
generate_mipmap();
}
-void Texture1D::image(const Graphics::Image &img, unsigned lv, bool srgb)
+void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelComponents comp, DataType type, const void *data)
+{
+ if(comp!=get_components(format) || type!=get_component_type(format))
+ throw incompatible_data("Texture1D::sub_image");
+ sub_image(level, x, wd, data);
+}
+
+void Texture1D::image(const Graphics::Image &img, unsigned lv)
{
if(img.get_height()!=1)
throw incompatible_data("Texture1D::image");
unsigned w = img.get_width();
PixelFormat fmt = pixelformat_from_image(img);
- PixelComponents comp = get_components(fmt);
- DataType type = get_component_type(fmt);
if(width==0)
- storage(make_pixelformat(comp, type, srgb), w, lv);
+ storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, lv);
else if(w!=width)
throw incompatible_data("Texture1D::image");
- image(0, comp, type, img.get_data());
+ image(0, img.get_pixels());
}
unsigned Texture1D::get_n_levels() const
UInt64 Texture1D::get_data_size() const
{
- return id ? width*get_pixel_size(ifmt) : 0;
+ return id ? width*get_pixel_size(storage_fmt) : 0;
}
void Texture1D::Loader::raw_data(const string &data)
{
- obj.image(0, get_components(obj.ifmt), get_component_type(obj.ifmt), data.data());
+ obj.image(0, data.data());
}
void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)