#include <msp/strings/format.h>
#include "bindable.h"
#include "error.h"
-#include "pixelstore.h"
#include "texturecube.h"
using namespace std;
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)
{
- Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
if(ARB_direct_state_access)
glTextureStorage2D(id, levels, storage_fmt, size, size);
else
else
{
for(unsigned i=0; i<6; ++i)
- image(enumerate_faces(i), level, 0);
+ image_(enumerate_faces(i), level, 0);
}
}
{
if(size==0)
throw invalid_operation("TextureCube::image");
-
- unsigned s = get_level_size(level);
- if(s==0)
+ if(level>=levels)
throw out_of_range("TextureCube::image");
if(ARB_texture_storage)
- return sub_image(face, level, 0, 0, s, s, data);
+ {
+ 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);
- BindRestore _bind(this);
+ 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 type = get_gl_type(get_component_type(storage_fmt));
- glTexImage2D(face, level, storage_fmt, s, s, 0, comp, type, data);
+ glTexImage2D(face, level, storage_fmt, lsz, lsz, 0, comp, type, data);
if(level==0)
{
allocated |= 1<<get_face_index(face);
if((allocated&63)==63)
- {
allocated |= 64;
- if(auto_gen_mipmap)
- {
- generate_mipmap();
- allocated |= (64<<levels)-1;
- }
- }
}
else if(!(allocated&(64<<level)))
{
for(unsigned i=0; i<6; ++i)
if(enumerate_faces(i)!=face)
- glTexImage2D(enumerate_faces(i), level, storage_fmt, s, s, 0, comp, type, 0);
+ glTexImage2D(enumerate_faces(i), level, storage_fmt, lsz, lsz, 0, comp, type, 0);
allocated |= 64<<level;
}
{
if(size==0)
throw invalid_operation("TextureCube::sub_image");
+ if(level>=levels)
+ throw out_of_range("TextureCube::sub_image");
- Conditional<BindRestore> _bind(!ARB_direct_state_acess, this);
- allocate(level);
+ 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 type = get_gl_type(get_component_type(storage_fmt));
glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
if(auto_gen_mipmap && level==0)
- generate_mipmap();
+ 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)
PixelFormat fmt = pixelformat_from_image(img);
storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
- PixelStore pstore = PixelStore::from_image(img);
- BindRestore _bind_ps(pstore);
-
image(face, 0, img.get_pixels());
}
else if(w!=size || h!=size)
throw incompatible_data("TextureCube::image");
- PixelStore pstore = PixelStore::from_image(img);
- BindRestore _bind_ps(pstore);
-
const char *pixels = reinterpret_cast<const char *>(img.get_pixels());
unsigned face_size = img.get_stride()*size;
for(unsigned i=0; i<6; ++i)