#include <msp/datafile/collection.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_seamless_cube_map.h>
#include <msp/gl/extensions/arb_texture_cube_map.h>
#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 "pixelstore.h"
#include "texturecube.h"
using namespace std;
namespace Msp {
namespace GL {
-TextureCubeFace TextureCube::face_order[6] =
+const TextureCubeFace TextureCube::face_order[6] =
{
POSITIVE_X,
NEGATIVE_X,
NEGATIVE_Z
};
-Vector3 TextureCube::directions[6] =
+const Vector3 TextureCube::directions[6] =
{
Vector3(1, 0, 0),
Vector3(-1, 0, 0),
Vector3(0, 0, -1)
};
-unsigned TextureCube::orientations[12] =
+const unsigned TextureCube::orientations[12] =
{
5, 3,
4, 3,
TextureCube::TextureCube():
Texture(GL_TEXTURE_CUBE_MAP),
- size(0),
- allocated(0)
+ size(0)
{
static Require _req(ARB_texture_cube_map);
+ if(ARB_seamless_cube_map)
+ {
+ static bool seamless_init = false;
+ if(!seamless_init)
+ {
+ glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
+ seamless_init = true;
+ }
+ }
}
void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
{
if(size>0)
- throw invalid_operation("TextureCube::storage");
+ {
+ if(fmt!=format || sz!=size || (lv && lv!=levels))
+ throw incompatible_data("TextureCube::storage");
+ return;
+ }
if(sz==0)
throw invalid_argument("TextureCube::storage");
levels = get_n_levels();
if(lv>0)
levels = min(levels, lv);
-}
-
-void TextureCube::allocate(unsigned level)
-{
- if(size==0)
- throw invalid_operation("TextureCube::allocate");
- if(level>=levels)
- throw invalid_argument("TextureCube::allocate");
- if(allocated&(64<<level))
- return;
+ GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
if(ARB_texture_storage)
{
- BindRestore _bind(this);
- glTexStorage2D(target, levels, storage_fmt, size, size);
- apply_swizzle();
- allocated |= (1<<levels)-1;
+ if(ARB_direct_state_access)
+ glTextureStorage2D(id, levels, gl_fmt, size, size);
+ else
+ {
+ bind_scratch();
+ glTexStorage2D(target, levels, gl_fmt, size, size);
+ }
}
else
{
- for(unsigned i=0; i<6; ++i)
- image(enumerate_faces(i), level, 0);
- }
-}
-
-void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
-{
- if(size==0)
- throw invalid_operation("TextureCube::image");
-
- unsigned s = get_level_size(level);
- if(s==0)
- throw out_of_range("TextureCube::image");
-
- if(ARB_texture_storage)
- return sub_image(face, level, 0, 0, s, s, data);
-
- BindRestore _bind(this);
-
- if(!allocated)
- {
- glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
- apply_swizzle();
- }
-
- PixelComponents comp = get_components(storage_fmt);
- DataType type = get_component_type(storage_fmt);
- glTexImage2D(face, level, storage_fmt, s, s, 0, comp, type, data);
-
- if(level==0)
- {
- allocated |= 1<<get_face_index(face);
- if((allocated&63)==63)
+ bind_scratch();
+ 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)
{
- allocated |= 64;
- if(auto_gen_mipmap)
- {
- generate_mipmap();
- allocated |= (64<<levels)-1;
- }
+ unsigned lv_size = get_level_size(i);
+ for(unsigned j=0; j<6; ++j)
+ glTexImage2D(enumerate_faces(j), i, gl_fmt, lv_size, lv_size, 0, comp, type, 0);
}
+ glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, 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);
- allocated |= 64<<level;
- }
+ apply_swizzle();
}
-void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data)
+void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
{
- if(comp!=get_components(format) || type!=get_component_type(format))
- throw incompatible_data("TextureCube::image");
- image(face, level, data);
+ unsigned lsz = get_level_size(level);
+ return sub_image(face, level, 0, 0, lsz, lsz, data);
}
void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
{
if(size==0)
throw invalid_operation("TextureCube::sub_image");
+ if(level>=levels)
+ throw out_of_range("TextureCube::sub_image");
- BindRestore _bind(this);
- allocate(level);
-
- PixelComponents comp = get_components(storage_fmt);
- DataType type = get_component_type(storage_fmt);
- glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
-
- if(auto_gen_mipmap && level==0)
- generate_mipmap();
-}
-
-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);
+ 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);
+ }
}
void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
{
unsigned w = img.get_width();
unsigned h = img.get_height();
- PixelFormat fmt = pixelformat_from_image(img);
- if(size==0)
- {
- if(w!=h)
- throw incompatible_data("TextureCube::image");
-
- storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
- }
- else if(w!=size || h!=size)
+ if(w!=h)
throw incompatible_data("TextureCube::image");
- PixelStore pstore = PixelStore::from_image(img);
- BindRestore _bind_ps(pstore);
+ PixelFormat fmt = pixelformat_from_image(img);
+ storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
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();
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)
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;
}
projects / libs / gl.git / blobdiff