#include <msp/gl/extensions/arb_texture_storage.h>
#include <msp/io/memory.h>
#include <msp/strings/format.h>
-#include "bindable.h"
#include "error.h"
#include "texturecube.h"
if(allocated&(64<<level))
return;
- 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 TextureCube::allocate_(unsigned level)
-{
if(ARB_texture_storage)
{
+ GLenum fmt = get_gl_pixelformat(storage_fmt);
if(ARB_direct_state_access)
- glTextureStorage2D(id, levels, storage_fmt, size, size);
+ glTextureStorage2D(id, levels, fmt, size, size);
else
- glTexStorage2D(target, levels, storage_fmt, size, size);
+ {
+ bind_scratch();
+ glTexStorage2D(target, levels, fmt, size, size);
+ }
apply_swizzle();
allocated |= (64<<levels)-1;
}
else
{
for(unsigned i=0; i<6; ++i)
- image_(enumerate_faces(i), level, 0);
+ image(enumerate_faces(i), level, 0);
}
}
if(level>=levels)
throw out_of_range("TextureCube::image");
+ unsigned lsz = get_level_size(level);
+
if(ARB_texture_storage)
- {
- unsigned lsz = get_level_size(level);
return sub_image(face, level, 0, 0, lsz, lsz, data);
- }
-
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(target, id);
-
- image_(face, level, data);
-
- if(auto_gen_mipmap && level==0 && (allocated&63)==63)
- {
- generate_mipmap_();
- allocated |= (64<<levels)-1;
- }
-
- glBindTexture(target, 0);
-}
-void TextureCube::image_(TextureCubeFace face, unsigned level, const void *data)
-{
if(!allocated)
{
glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
apply_swizzle();
}
- unsigned lsz = 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(face, level, storage_fmt, lsz, lsz, 0, comp, type, data);
+ glTexImage2D(face, level, fmt, lsz, lsz, 0, comp, type, data);
if(level==0)
{
{
for(unsigned i=0; i<6; ++i)
if(enumerate_faces(i)!=face)
- glTexImage2D(enumerate_faces(i), level, storage_fmt, lsz, lsz, 0, comp, type, 0);
+ glTexImage2D(enumerate_faces(i), level, fmt, lsz, lsz, 0, comp, type, 0);
allocated |= 64<<level;
}
}
-void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data)
-{
- if(comp!=get_components(format) || type!=get_component_type(format))
- throw incompatible_data("TextureCube::image");
- image(face, level, data);
-}
-
void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
{
if(size==0)
if(level>=levels)
throw out_of_range("TextureCube::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)
glTextureSubImage3D(id, level, x, y, get_face_index(face), wd, ht, 1, comp, type, data);
else
+ {
+ bind_scratch();
glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
-
- if(auto_gen_mipmap && level==0)
- generate_mipmap_();
-
- if(!direct)
- glBindTexture(target, 0);
-}
-
-void TextureCube::sub_image(TextureCubeFace face, 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("TextureCube::subimage");
- sub_image(face, level, x, y, wd, ht, data);
+ }
}
void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
image(face, 0, img.get_pixels());
}
-void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool)
-{
- image(face, img);
-}
-
void TextureCube::image(const Graphics::Image &img, unsigned lv)
{
unsigned w = img.get_width();
return fv+s*sv+t*tv;
}
-UInt64 TextureCube::get_data_size() const
+uint64_t TextureCube::get_data_size() const
{
return id ? size*size*6*get_pixel_size(storage_fmt) : 0;
}