#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_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;
+ Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
+ if(ARB_direct_state_access)
+ glTextureStorage3D(id, levels, storage_fmt, width, height, depth);
+ else
+ glTexStorage3D(target, levels, storage_fmt, width, height, depth);
+ apply_swizzle();
+ allocated |= (1<<levels)-1;
}
else
- {
- PixelFormat base_fmt = get_base_pixelformat(ifmt);
- image(level, base_fmt, get_alloc_type(base_fmt), 0);
- }
+ image(level, 0);
}
-void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
+void Texture3D::image(unsigned level, const void *data)
{
if(width==0 || height==0 || depth==0)
throw invalid_operation("Texture3D::image");
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);
+ return sub_image(level, 0, 0, 0, w, h, d, data);
- glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+ BindRestore _bind(this);
+
+ if(!allocated)
+ {
+ glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+ apply_swizzle();
+ }
+
+ PixelComponents comp = get_components(storage_fmt);
+ DataType type = get_component_type(storage_fmt);
+ glTexImage3D(target, level, storage_fmt, width, height, depth, 0, comp, 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;
}
}
-void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelFormat fmt, DataType type, const void *data)
+void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+{
+ if(comp!=get_components(format) || type!=get_component_type(format))
+ throw incompatible_data("Texture3D::image");
+ image(level, data);
+}
+
+void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
{
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);
+ PixelComponents comp = get_components(storage_fmt);
+ DataType type = get_component_type(storage_fmt);
+ if(ARB_direct_state_access)
+ glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, comp, type, data);
+ else
+ glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, 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)
+void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data)
{
- 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(comp!=get_components(format) || type!=get_component_type(format))
+ throw incompatible_data("Texture3D::sub_image");
+ sub_image(level, x, y, z, wd, ht, dp, data);
}
-void Texture3D::image(const Graphics::Image &img, bool srgb)
+void Texture3D::image(const Graphics::Image &img, unsigned lv)
{
unsigned w = img.get_width();
unsigned h = img.get_height();
- unsigned d = 1;
- if(depth)
- {
- if(h%depth)
- throw incompatible_data("Texture3D::load_image");
- h /= depth;
- d = depth;
- }
- else
- {
- if(h%w)
- throw incompatible_data("Texture3D::load_image");
- d = h/w;
- h = w;
- }
+ if(h%w)
+ throw incompatible_data("Texture3D::load_image");
+ unsigned d = h/w;
+ h = w;
- PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+ PixelFormat fmt = pixelformat_from_image(img);
if(width==0)
- storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d);
+ storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, d, lv);
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());
+ image(0, img.get_pixels());
}
unsigned Texture3D::get_n_levels() const
UInt64 Texture3D::get_data_size() const
{
- return id ? width*height*depth*get_pixel_size(ifmt) : 0;
+ return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
}
{
add("raw_data", &Loader::raw_data);
add("storage", &Loader::storage);
+ add("storage", &Loader::storage_levels);
}
void Texture3D::Loader::raw_data(const string &data)
{
- obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+ obj.image(0, data.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
projects / libs / gl.git / blobdiff