namespace Msp {
namespace GL {
-Texture1D::Texture1D():
- width(0)
-{ }
-
void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
{
if(width>0)
{
- if(fmt!=format || wd!=width || (lv && lv!=levels))
+ if(fmt!=format || wd!=width || (lv && lv!=n_levels))
throw incompatible_data("Texture1D::storage");
return;
}
set_format(fmt);
width = wd;
- levels = get_n_levels();
+ n_levels = count_levels(width);
if(lv)
- levels = min(levels, lv);
+ n_levels = min(n_levels, lv);
allocate();
}
return sub_image(level, 0, get_level_size(level), data);
}
-void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
+void Texture1D::sub_image(unsigned level, unsigned x, unsigned wd, const void *data)
{
if(width==0)
throw invalid_operation("Texture1D::sub_image");
- if(level>=levels)
+ if(level>=n_levels || x>width || x+wd>width)
throw out_of_range("Texture1D::sub_image");
Texture1DBackend::sub_image(level, x, wd, data);
image(0, img.get_pixels());
}
-unsigned Texture1D::get_n_levels() const
-{
- unsigned n = 0;
- for(unsigned s=width; s; s>>=1, ++n) ;
- return n;
-}
-
unsigned Texture1D::get_level_size(unsigned level) const
{
return width>>level;
}
-uint64_t Texture1D::get_data_size() const
-{
- return id ? width*get_pixel_size(storage_fmt) : 0;
-}
-
Texture1D::Loader::Loader(Texture1D &t):
DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>(t)
void Texture1D::Loader::init()
{
- add("raw_data", &Loader::raw_data);
add("storage", &Loader::storage);
add("storage", &Loader::storage_levels);
}
-void Texture1D::Loader::raw_data(const string &data)
-{
- obj.image(0, data.data());
-}
-
void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
{
obj.storage(fmt, w);