+#include <msp/core/raii.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_texture_storage.h>
#include "bindable.h"
#include "buffer.h"
#include "error.h"
Texture2D::Texture2D(ResourceManager *m):
Texture(GL_TEXTURE_2D, m),
- ifmt(RGB),
width(0),
height(0),
allocated(0)
throw invalid_operation("Texture2D::storage");
if(wd==0 || ht==0)
throw invalid_argument("Texture2D::storage");
- require_pixelformat(fmt);
- ifmt = fmt;
+ set_internal_format(fmt);
width = wd;
height = ht;
}
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)
+ glTextureStorage2D(id, n_levels, ifmt, width, height);
+ else
+ {
+ BindRestore _bind(this);
+ glTexStorage2D(target, n_levels, ifmt, width, height);
+ }
+ allocated |= (1<<n_levels)-1;
+ }
+ else
+ {
+ PixelFormat base_fmt = get_base_pixelformat(ifmt);
+ image(level, base_fmt, get_alloc_type(base_fmt), 0);
+ }
}
void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
unsigned h = height;
get_level_size(level, w, h);
+ if(ARB_texture_storage)
+ return sub_image(level, 0, 0, w, h, fmt, type, data);
+
BindRestore _bind(this);
- glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
+ glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
allocated |= 1<<level;
if(gen_mipmap && level==0)
{
auto_generate_mipmap();
- for(; (w || h); w>>=1, h>>=1, ++level) ;
- allocated |= (1<<level)-1;
+ allocated |= (1<<get_n_levels())-1;
}
}
if(width==0 || height==0)
throw invalid_operation("Texture2D::sub_image");
+ Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
allocate(level);
- BindRestore _bind(this);
- glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+ fmt = get_upload_format(fmt);
+ if(ARB_direct_state_access)
+ glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
+ else
+ glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+
+ if(gen_mipmap && level==0)
+ auto_generate_mipmap();
}
void Texture2D::image(const Graphics::Image &img, bool srgb)
image(0, fmt, UNSIGNED_BYTE, from_buffer ? 0 : img.get_data());
}
-void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
+unsigned Texture2D::get_n_levels() const
+{
+ unsigned n = 0;
+ for(unsigned s=max(width, height); s; s>>=1, ++n) ;
+ return n;
+}
+
+void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const
{
w >>= level;
h >>= level;
UInt64 Texture2D::get_data_size() const
{
- return id ? width*height*get_component_count(ifmt) : 0;
+ return id ? width*height*get_pixel_size(ifmt) : 0;
}
void Texture2D::unload()
{
add("raw_data", &Loader::raw_data);
add("storage", &Loader::storage);
- add("storage", &Loader::storage_b);
}
void Texture2D::Loader::raw_data(const string &data)
obj.storage(fmt, w, h);
}
-void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
-{
- storage(fmt, w, h);
-}
-
Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
texture(t),