Texture2D::Texture2D(ResourceManager *m):
Texture(GL_TEXTURE_2D, m),
- ifmt(RGB),
width(0),
height(0),
allocated(0)
set_manager(0);
}
-void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
+void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
{
if(width>0)
throw invalid_operation("Texture2D::storage");
if(wd==0 || ht==0)
throw invalid_argument("Texture2D::storage");
- if(MSP_sized_internal_formats)
- fmt = get_sized_pixelformat(fmt);
- require_pixelformat(fmt);
-
- ifmt = fmt;
+ set_internal_format(fmt);
width = wd;
height = ht;
+ levels = get_n_levels();
+ if(lv>0)
+ levels = min(levels, lv);
}
void Texture2D::allocate(unsigned level)
{
+ if(width==0 || height==0)
+ throw invalid_operation("Texture2D::allocate");
+ if(level>=levels)
+ throw invalid_argument("Texture2D::allocate");
if(allocated&(1<<level))
return;
if(ARB_texture_storage)
{
- unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
if(ARB_direct_state_access)
- glTextureStorage2D(id, n_levels, ifmt, width, height);
+ glTextureStorage2D(id, levels, ifmt, width, height);
else
{
BindRestore _bind(this);
- glTexStorage2D(target, n_levels, ifmt, width, height);
+ glTexStorage2D(target, levels, ifmt, width, height);
}
- allocated |= (1<<n_levels)-1;
+ allocated |= (1<<levels)-1;
}
else
{
return sub_image(level, 0, 0, w, h, fmt, type, data);
BindRestore _bind(this);
- glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
+
+ if(!allocated)
+ glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+ glTexImage2D(target, level, ifmt, w, h, 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;
}
}
Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
allocate(level);
+ fmt = get_upload_format(fmt);
if(ARB_direct_state_access)
glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
else
glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
- if(gen_mipmap && level==0)
- auto_generate_mipmap();
+ if(auto_gen_mipmap && level==0)
+ generate_mipmap();
}
-void Texture2D::image(const Graphics::Image &img, bool srgb)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb)
{
- image(img, srgb, false);
+ image(img, lv, srgb, false);
}
-void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb, bool from_buffer)
{
unsigned w = img.get_width();
unsigned h = img.get_height();
PixelFormat fmt = pixelformat_from_graphics(img.get_format());
if(width==0)
- storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h);
- else if(w!=width || h!=height)
+ storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, lv);
+ else if(w!=width || h!=height || (lv && lv!=levels))
throw incompatible_data("Texture2D::image");
PixelStore pstore = PixelStore::from_image(img);
UInt64 Texture2D::get_data_size() const
{
- return id ? width*height*get_component_count(ifmt) : 0;
+ return id ? width*height*get_pixel_size(ifmt) : 0;
}
void Texture2D::unload()
{
glDeleteTextures(1, &id);
id = 0;
+ allocated = 0;
// TODO check which params actually need refreshing
dirty_params = -1;
}
{
add("raw_data", &Loader::raw_data);
add("storage", &Loader::storage);
+ add("storage", &Loader::storage_levels);
}
void Texture2D::Loader::raw_data(const string &data)
void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
{
- if(srgb)
- fmt = get_srgb_pixelformat(fmt);
obj.storage(fmt, w, h);
}
+void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, unsigned l)
+{
+ obj.storage(fmt, w, h, l);
+}
+
Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
texture(t),
}
else if(phase==1)
{
- pixel_buffer.data(n_bytes, 0);
- mapped_address = reinterpret_cast<char *>(pixel_buffer.map(WRITE_ONLY));
+ pixel_buffer.storage(n_bytes);
+ mapped_address = reinterpret_cast<char *>(pixel_buffer.map());
}
else if(phase==2)
{
}
if(!texture.id)
- glGenTextures(1, &texture.id);
- texture.image(image, srgb_conversion, true);
+ {
+ if(ARB_direct_state_access)
+ glCreateTextures(texture.target, 1, &texture.id);
+ else
+ glGenTextures(1, &texture.id);
+ }
+ texture.image(image, 0, srgb_conversion, true);
}
++phase;