#include <msp/gl/extensions/arb_direct_state_access.h>
#include <msp/gl/extensions/arb_texture_storage.h>
#include <msp/graphics/imageloader.h>
-#include "bindable.h"
#include "buffer.h"
#include "error.h"
#include "resources.h"
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;
if(ARB_texture_storage)
{
+ GLenum fmt = get_gl_pixelformat(storage_fmt);
if(ARB_direct_state_access)
- glTextureStorage2D(id, levels, storage_fmt, width, height);
+ glTextureStorage2D(id, levels, fmt, width, height);
else
- glTexStorage2D(target, levels, storage_fmt, width, height);
+ {
+ bind_scratch();
+ glTexStorage2D(target, levels, fmt, width, height);
+ }
apply_swizzle();
allocated |= (1<<levels)-1;
}
else
- image_(level, 0);
+ image(level, 0);
}
void Texture2D::image(unsigned level, const void *data)
if(level>=levels)
throw out_of_range("Texture2D::image");
+ LinAl::Vector<unsigned, 2> size = get_level_size(level);
+
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);
+ bind_scratch();
- 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)
{
glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
apply_swizzle();
}
- LinAl::Vector<unsigned, 2> size = get_level_size(level);
- PixelComponents comp = get_components(storage_fmt);
+ GLenum fmt = get_gl_pixelformat(storage_fmt);
+ GLenum comp = get_gl_components(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);
+ glTexImage2D(target, level, fmt, size.x, size.y, 0, comp, type, data);
allocated |= 1<<level;
}
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);
- 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)
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;