#include <cmath>
+#include <msp/core/raii.h>
+#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"
Texture3D::Texture3D(GLenum t):
Texture(t),
- ifmt(RGB),
width(0),
height(0),
depth(0),
Texture3D::Texture3D():
Texture(GL_TEXTURE_3D),
- ifmt(RGB),
width(0),
height(0),
depth(0),
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");
if(wd==0 || ht==0 || dp==0)
throw invalid_argument("Texture3D::storage");
- if(MSP_sized_internal_formats)
- fmt = get_sized_pixelformat(fmt);
- require_pixelformat(fmt);
-
- ifmt = fmt;
+ set_internal_format(fmt);
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)
{
- BindRestore _bind(this);
- unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
- glTexStorage3D(target, n_levels, ifmt, width, height, depth);
- allocated |= (1<<n_levels)-1;
+ if(ARB_direct_state_access)
+ glTextureStorage3D(id, levels, ifmt, width, height, depth);
+ else
+ {
+ BindRestore _bind(this);
+ glTexStorage3D(target, levels, ifmt, width, height, depth);
+ }
+ allocated |= (1<<levels)-1;
}
else
{
unsigned d = depth;
get_level_size(level, w, h, d);
- BindRestore _bind(this);
if(ARB_texture_storage)
return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
- glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+ BindRestore _bind(this);
+ 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;
}
}
if(width==0 || height==0 || depth==0)
throw invalid_operation("Texture3D::image");
+ Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
allocate(level);
- BindRestore _bind(this);
- glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
+ 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();
+ 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)
- storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d);
+ {
+ 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)
throw incompatible_data("Texture3D::load_image");
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);
}