return sub_image(level, 0, w, fmt, type, data);
BindRestore _bind(this);
+
+ if(!allocated)
+ glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
glTexImage1D(target, level, ifmt, w, 0, get_upload_format(fmt), type, data);
allocated |= 1<<level;
- if(gen_mipmap && level==0)
+ if(auto_gen_mipmap && level==0)
{
- auto_generate_mipmap();
- allocated |= (1<<get_n_levels())-1;
+ generate_mipmap();
+ allocated |= (1<<levels)-1;
}
}
else
glTexSubImage1D(target, level, x, wd, fmt, type, data);
- if(gen_mipmap && level==0)
- auto_generate_mipmap();
+ if(auto_gen_mipmap && level==0)
+ generate_mipmap();
}
-void Texture1D::image(const Graphics::Image &img, bool srgb)
+void Texture1D::image(const Graphics::Image &img, unsigned lv, bool srgb)
{
if(img.get_height()!=1)
throw incompatible_data("Texture1D::image");
unsigned w = img.get_width();
PixelFormat fmt = pixelformat_from_graphics(img.get_format());
if(width==0)
- {
- unsigned l = (is_mipmapped(min_filter) ? 0 : 1);
- storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, l);
- }
+ storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, lv);
else if(w!=width)
throw incompatible_data("Texture1D::image");
{
add("raw_data", &Loader::raw_data);
add("storage", &Loader::storage);
+ add("storage", &Loader::storage_levels);
}
void Texture1D::Loader::raw_data(const string &data)
void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
{
- if(srgb)
- fmt = get_srgb_pixelformat(fmt);
obj.storage(fmt, w);
}
+void Texture1D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned l)
+{
+ obj.storage(fmt, w, l);
+}
+
} // namespace GL
} // namespace Msp