void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
{
if(width>0)
- throw invalid_operation("Texture2D::storage");
+ {
+ if(fmt!=format || wd!=width || ht!=height || (lv && lv!=levels))
+ throw incompatible_data("Texture2D::storage");
+ return;
+ }
if(wd==0 || ht==0)
throw invalid_argument("Texture2D::storage");
}
PixelComponents comp = get_components(storage_fmt);
- DataType type = get_component_type(storage_fmt);
+ GLenum type = get_gl_type(get_component_type(storage_fmt));
glTexImage2D(target, level, storage_fmt, w, h, 0, comp, type, data);
allocated |= 1<<level;
allocate(level);
PixelComponents comp = get_components(storage_fmt);
- DataType type = get_component_type(storage_fmt);
+ GLenum type = get_gl_type(get_component_type(storage_fmt));
if(ARB_direct_state_access)
glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
else
unsigned w = img.get_width();
unsigned h = img.get_height();
PixelFormat fmt = pixelformat_from_image(img);
- if(width==0)
- storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
- else if(w!=width || h!=height || (lv && lv!=levels))
- throw incompatible_data("Texture2D::image");
+ storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
PixelStore pstore = PixelStore::from_image(img);
BindRestore _bind_ps(pstore);
void Texture2D::Loader::raw_data(const string &data)
{
+ if(obj.manager)
+ {
+ obj.set_manager(0);
+ if(!obj.id)
+ obj.generate_id();
+ }
obj.image(0, data.data());
}
}
if(!texture.id)
- {
- if(ARB_direct_state_access)
- glCreateTextures(texture.target, 1, &texture.id);
- else
- glGenTextures(1, &texture.id);
- }
+ texture.generate_id();
texture.image(image, 0, true);
}