-#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/arb_vertex_buffer_object.h>
#include <msp/graphics/imageloader.h>
#include "buffer.h"
#include "error.h"
Texture2D::Texture2D(ResourceManager *m):
Texture(GL_TEXTURE_2D, m),
width(0),
- height(0),
- allocated(0)
+ height(0)
{ }
Texture2D::~Texture2D()
levels = get_n_levels();
if(lv>0)
levels = min(levels, lv);
-}
-
-void Texture2D::allocate(unsigned level)
-{
- if(width==0 || height==0)
- throw invalid_operation("Texture2D::allocate");
- if(level>=levels)
- throw invalid_argument("Texture2D::allocate");
-
- bool direct = ARB_texture_storage && ARB_direct_state_access;
- if(!direct)
- {
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(target, id);
- }
-
- allocate_(level);
-
- if(!direct)
- glBindTexture(target, 0);
-}
-
-void Texture2D::allocate_(unsigned level)
-{
- if(allocated&(1<<level))
- return;
+ GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
if(ARB_texture_storage)
{
if(ARB_direct_state_access)
- glTextureStorage2D(id, levels, storage_fmt, width, height);
+ glTextureStorage2D(id, levels, gl_fmt, width, height);
else
- glTexStorage2D(target, levels, storage_fmt, width, height);
- apply_swizzle();
- allocated |= (1<<levels)-1;
+ {
+ bind_scratch();
+ glTexStorage2D(target, levels, gl_fmt, width, height);
+ }
}
else
- image_(level, 0);
-}
-
-void Texture2D::image(unsigned level, const void *data)
-{
- if(width==0 || height==0)
- throw invalid_operation("Texture2D::image");
- if(level>=levels)
- throw out_of_range("Texture2D::image");
-
- if(ARB_texture_storage)
- {
- LinAl::Vector<unsigned, 2> size = get_level_size(level);
- return sub_image(level, 0, 0, size.x, size.y, data);
- }
-
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(target, id);
-
- image_(level, data);
-
- if(auto_gen_mipmap && level==0)
- {
- generate_mipmap_();
- allocated |= (1<<levels)-1;
- }
-
- glBindTexture(target, 0);
-}
-
-void Texture2D::image_(unsigned level, const void *data)
-{
- if(!allocated)
{
+ bind_scratch();
glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
- apply_swizzle();
+ GLenum comp = get_gl_components(get_components(storage_fmt));
+ GLenum type = get_gl_type(get_component_type(storage_fmt));
+ for(unsigned i=0; i<levels; ++i)
+ {
+ LinAl::Vector<unsigned, 2> lv_size = get_level_size(i);
+ glTexImage2D(target, i, gl_fmt, lv_size.x, lv_size.y, 0, comp, type, 0);
+ }
}
- LinAl::Vector<unsigned, 2> size = get_level_size(level);
- PixelComponents comp = get_components(storage_fmt);
- GLenum type = get_gl_type(get_component_type(storage_fmt));
- glTexImage2D(target, level, storage_fmt, size.x, size.y, 0, comp, type, data);
-
- allocated |= 1<<level;
+ apply_swizzle();
}
-void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+void Texture2D::image(unsigned level, const void *data)
{
- if(comp!=get_components(format) || type!=get_component_type(format))
- throw incompatible_data("Texture2D::image");
- image(level, data);
+ LinAl::Vector<unsigned, 2> size = get_level_size(level);
+ return sub_image(level, 0, 0, size.x, size.y, data);
}
void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
if(level>=levels)
throw out_of_range("Texture2D::sub_image");
- bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
- if(!direct)
- {
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(target, id);
- }
-
- allocate_(level);
-
- PixelComponents comp = get_components(storage_fmt);
+ GLenum comp = get_gl_components(get_components(storage_fmt));
GLenum type = get_gl_type(get_component_type(storage_fmt));
if(ARB_direct_state_access)
glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
else
+ {
+ bind_scratch();
glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
-
- if(auto_gen_mipmap && level==0)
- generate_mipmap_();
-
- if(!direct)
- glBindTexture(target, 0);
-}
-
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
-{
- if(comp!=get_components(format) || type!=get_component_type(format))
- throw incompatible_data("Texture2D::sub_image");
- sub_image(level, x, y, wd, ht, data);
+ }
}
void Texture2D::image(const Graphics::Image &img, unsigned lv)
return ldr;
}
-UInt64 Texture2D::get_data_size() const
+uint64_t Texture2D::get_data_size() const
{
return id ? width*height*get_pixel_size(format) : 0;
}
{
glDeleteTextures(1, &id);
id = 0;
- allocated = 0;
}
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer.get_id());
texture.image(image, 0, true);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+ if(texture.auto_gen_mipmap)
+ texture.generate_mipmap();
}
++phase;