void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
{
if(size>0)
- throw invalid_operation("TextureCube::storage");
+ {
+ if(fmt!=format || sz!=size || (lv && lv!=levels))
+ throw incompatible_data("TextureCube::storage");
+ return;
+ }
if(sz==0)
throw invalid_argument("TextureCube::storage");
BindRestore _bind(this);
glTexStorage2D(target, levels, storage_fmt, size, size);
apply_swizzle();
- allocated |= (1<<levels)-1;
+ allocated |= (64<<levels)-1;
}
else
{
}
PixelComponents comp = get_components(storage_fmt);
- DataType type = get_component_type(storage_fmt);
+ GLenum type = get_gl_type(get_component_type(storage_fmt));
glTexImage2D(face, level, storage_fmt, s, s, 0, comp, type, data);
if(level==0)
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));
glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
if(auto_gen_mipmap && level==0)
{
unsigned w = img.get_width();
unsigned h = img.get_height();
- PixelFormat fmt = pixelformat_from_image(img);
- if(size==0)
- {
- if(w!=h)
- throw incompatible_data("TextureCube::image");
-
- storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
- }
- else if(w!=size || h!=size)
+ if(w!=h)
throw incompatible_data("TextureCube::image");
+ PixelFormat fmt = pixelformat_from_image(img);
+ storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
+
PixelStore pstore = PixelStore::from_image(img);
BindRestore _bind_ps(pstore);