+#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"
#include "error.h"
Texture1D::Texture1D():
Texture(GL_TEXTURE_1D),
- ifmt(RGB),
width(0),
allocated(0)
{
throw invalid_operation("Texture1D::storage");
if(wd==0)
throw invalid_argument("Texture1D::storage");
- require_pixelformat(fmt);
- ifmt = fmt;
+ set_internal_format(fmt);
width = wd;
}
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)
+ glTextureStorage1D(id, n_levels, ifmt, width);
+ else
+ {
+ BindRestore _bind(this);
+ glTexStorage1D(target, n_levels, ifmt, width);
+ }
+ allocated |= (1<<n_levels)-1;
+ }
+ else
+ {
+ PixelFormat base_fmt = get_base_pixelformat(ifmt);
+ image(level, base_fmt, get_alloc_type(base_fmt), 0);
+ }
}
void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
unsigned w = get_level_size(level);
+ if(ARB_texture_storage)
+ return sub_image(level, 0, w, fmt, type, data);
+
BindRestore _bind(this);
- glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
+ glTexImage1D(target, level, ifmt, w, 0, get_upload_format(fmt), type, data);
allocated |= 1<<level;
if(gen_mipmap && level==0)
{
auto_generate_mipmap();
- for(; w; w>>=1, ++level) ;
- allocated |= (1<<level)-1;
+ allocated |= (1<<get_n_levels())-1;
}
}
+void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, DataType type, const void *data)
+{
+ if(width==0)
+ throw invalid_operation("Texture3D::image");
+
+ Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
+ allocate(level);
+
+ 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(gen_mipmap && level==0)
+ auto_generate_mipmap();
+}
+
void Texture1D::image(const Graphics::Image &img, bool srgb)
{
if(img.get_height()!=1)
image(0, fmt, UNSIGNED_BYTE, img.get_data());
}
-unsigned Texture1D::get_level_size(unsigned level)
+unsigned Texture1D::get_n_levels() const
+{
+ unsigned n = 0;
+ for(unsigned s=width; s; s>>=1, ++n) ;
+ return n;
+}
+
+unsigned Texture1D::get_level_size(unsigned level) const
{
return width>>level;
}