glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
allocated |= 1<<level;
- if(gen_mipmap && level==0)
+ if(auto_gen_mipmap && level==0)
{
- auto_generate_mipmap();
+ generate_mipmap();
allocated |= (1<<get_n_levels())-1;
}
}
else
glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
- if(gen_mipmap && level==0)
- auto_generate_mipmap();
+ if(auto_gen_mipmap && level==0)
+ generate_mipmap();
}
void Texture3D::load_image(const string &fn, int dp)
PixelFormat fmt = pixelformat_from_graphics(img.get_format());
if(width==0)
{
- unsigned l = (is_mipmapped(min_filter) ? 0 : 1);
+ unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, l);
}
else if(w!=width || h!=height || d!=depth)
void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned d)
{
- if(srgb)
- fmt = get_srgb_pixelformat(fmt);
obj.storage(fmt, w, h, d);
}