#include <msp/gl/extensions/arb_direct_state_access.h>
#include <msp/gl/extensions/arb_texture_storage.h>
#include <msp/gl/extensions/ext_texture3d.h>
+#include <msp/gl/extensions/ext_texture_array.h>
#include <msp/graphics/image.h>
#include "bindable.h"
#include "error.h"
static Require _req(EXT_texture3D);
}
-void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
+void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv)
{
if(width>0)
throw invalid_operation("Texture3D::storage");
width = wd;
height = ht;
depth = dp;
+ levels = get_n_levels();
+ if(lv>0)
+ levels = min(levels, lv);
}
void Texture3D::allocate(unsigned level)
{
+ if(width==0 || height==0 || depth==0)
+ throw invalid_operation("Texture3D::allocate");
+ if(level>=levels)
+ throw invalid_argument("Texture3D::allocate");
if(allocated&(1<<level))
return;
if(ARB_texture_storage)
{
- unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+ Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
if(ARB_direct_state_access)
- glTextureStorage3D(id, n_levels, ifmt, width, height, depth);
+ glTextureStorage3D(id, levels, ifmt, width, height, depth);
else
- {
- BindRestore _bind(this);
- glTexStorage3D(target, n_levels, ifmt, width, height, depth);
- }
- allocated |= (1<<n_levels)-1;
+ glTexStorage3D(target, levels, ifmt, width, height, depth);
+ apply_swizzle();
+ allocated |= (1<<levels)-1;
}
else
{
return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
BindRestore _bind(this);
- glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+
+ if(!allocated)
+ {
+ glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+ apply_swizzle();
+ }
+ 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();
- 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)
glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, fmt, type, data);
else
glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
- if(gen_mipmap && level==0)
- auto_generate_mipmap();
-}
-
-void Texture3D::load_image(const string &fn, int dp)
-{
- Graphics::Image img;
- img.load_file(fn);
-
- unsigned w = img.get_width();
- unsigned h = img.get_height();
- unsigned d = 1;
-
- if(dp==-1)
- {
- if(h%w)
- throw incompatible_data("Texture3D::load_image");
- d = h/w;
- h = w;
- }
- else if(dp==-2)
- {
- for(d=h; d*d>h; d>>=2) ;
- for(; d*d<h; ++d) ;
- if(d*d!=h)
- throw incompatible_data("Texture3D::load_image");
- h = d;
- }
- else if(dp>0)
- {
- d = dp;
- if(h%d)
- throw incompatible_data("Texture3D::load_image");
- h /= d;
- }
- else
- throw invalid_argument("Texture3D::load_image");
-
- PixelFormat fmt = pixelformat_from_graphics(img.get_format());
- if(width==0)
- storage(storage_pixelformat_from_graphics(img.get_format()), w, h, d);
- else if(w!=width || h!=height || d!=depth)
- throw incompatible_data("Texture3D::load_image");
-
- PixelStore pstore = PixelStore::from_image(img);
- BindRestore _bind_ps(pstore);
-
- image(0, fmt, UNSIGNED_BYTE, img.get_data());
+ if(auto_gen_mipmap && level==0)
+ generate_mipmap();
}
-void Texture3D::image(const Graphics::Image &img, bool srgb)
+void Texture3D::image(const Graphics::Image &img, unsigned lv, bool srgb)
{
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, d);
+ storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, lv);
else if(w!=width || h!=height || d!=depth)
throw incompatible_data("Texture3D::load_image");
{
add("raw_data", &Loader::raw_data);
add("storage", &Loader::storage);
+ add("storage", &Loader::storage_levels);
}
void Texture3D::Loader::raw_data(const string &data)
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);
}
+void Texture3D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, unsigned d, unsigned l)
+{
+ obj.storage(fmt, w, h, d, l);
+}
+
} // namespace GL
} // namespace Msp