+#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/msp_texture1d.h>
#include "bindable.h"
Texture1D::Texture1D():
Texture(GL_TEXTURE_1D),
- ifmt(RGB),
width(0),
allocated(0)
{
static Require _req(MSP_texture1D);
}
-void Texture1D::storage(PixelFormat fmt, unsigned wd)
+void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
{
if(width>0)
throw invalid_operation("Texture1D::storage");
if(wd==0)
throw invalid_argument("Texture1D::storage");
- if(MSP_sized_internal_formats)
- fmt = get_sized_pixelformat(fmt);
- require_pixelformat(fmt);
-
- ifmt = fmt;
+ set_internal_format(fmt);
width = wd;
+ levels = get_n_levels();
+ if(lv)
+ levels = min(levels, lv);
}
void Texture1D::allocate(unsigned level)
{
+ if(width==0)
+ throw invalid_operation("Texture1D::allocate");
+ if(level>=levels)
+ throw invalid_argument("Texture1D::allocate");
if(allocated&(1<<level))
return;
if(ARB_texture_storage)
{
- BindRestore _bind(this);
- unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
- glTexStorage1D(target, n_levels, ifmt, width);
- allocated |= (1<<n_levels)-1;
+ if(ARB_direct_state_access)
+ glTextureStorage1D(id, levels, ifmt, width);
+ else
+ {
+ BindRestore _bind(this);
+ glTexStorage1D(target, levels, ifmt, width);
+ }
+ allocated |= (1<<levels)-1;
}
else
{
unsigned w = get_level_size(level);
- BindRestore _bind(this);
if(ARB_texture_storage)
- sub_image(level, 0, w, fmt, type, data);
- else
- glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
+ return sub_image(level, 0, w, fmt, type, data);
+
+ BindRestore _bind(this);
+ glTexImage1D(target, level, ifmt, w, 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)
throw invalid_operation("Texture3D::image");
+ Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
allocate(level);
- BindRestore _bind(this);
- glTexSubImage1D(target, level, x, wd, fmt, type, data);
+ fmt = get_upload_format(fmt);
+ if(ARB_direct_state_access)
+ glTextureSubImage1D(id, level, x, wd, fmt, type, data);
+ else
+ glTexSubImage1D(target, level, x, wd, fmt, type, data);
+
+ if(auto_gen_mipmap && level==0)
+ generate_mipmap();
}
void Texture1D::image(const Graphics::Image &img, bool srgb)
unsigned w = img.get_width();
PixelFormat fmt = pixelformat_from_graphics(img.get_format());
if(width==0)
- storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+ {
+ unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
+ storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, l);
+ }
else if(w!=width)
throw incompatible_data("Texture1D::image");
void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
{
- if(srgb)
- fmt = get_srgb_pixelformat(fmt);
obj.storage(fmt, w);
}