#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/graphics/image.h>
#include "bindable.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),
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;
if(allocated&(1<<level))
return;
- PixelFormat base_fmt = get_base_pixelformat(ifmt);
- image(level, base_fmt, get_alloc_type(base_fmt), 0);
+ if(ARB_texture_storage)
+ {
+ unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+ if(ARB_direct_state_access)
+ glTextureStorage3D(id, n_levels, ifmt, width, height, depth);
+ else
+ {
+ BindRestore _bind(this);
+ glTexStorage3D(target, n_levels, ifmt, width, height, depth);
+ }
+ allocated |= (1<<n_levels)-1;
+ }
+ else
+ {
+ PixelFormat base_fmt = get_base_pixelformat(ifmt);
+ image(level, base_fmt, get_alloc_type(base_fmt), 0);
+ }
}
void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
unsigned d = depth;
get_level_size(level, w, h, d);
+ if(ARB_texture_storage)
+ 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);
+ glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
allocated |= 1<<level;
if(gen_mipmap && level==0)
{
auto_generate_mipmap();
- for(; (w || h || d); w>>=1, h>>=1, d>>=1, ++level) ;
- allocated |= (1<<level)-1;
+ 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();
}
void Texture3D::load_image(const string &fn, int dp)
image(0, fmt, UNSIGNED_BYTE, img.get_data());
}
-void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
+unsigned Texture3D::get_n_levels() const
+{
+ unsigned s = max(width, height);
+ if(target!=GL_TEXTURE_2D_ARRAY)
+ s = max(s, depth);
+ unsigned n = 0;
+ for(; s; s>>=1, ++n) ;
+ return n;
+}
+
+void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d) const
{
w >>= level;
h >>= level;