if(sz==0)
throw invalid_argument("TextureCube::storage");
- set_internal_format(fmt);
+ set_format(fmt);
size = sz;
levels = get_n_levels();
if(lv>0)
throw invalid_operation("TextureCube::allocate");
if(level>=levels)
throw invalid_argument("TextureCube::allocate");
- if(allocated&(1<<level))
+ if(allocated&(64<<level))
return;
if(ARB_texture_storage)
{
BindRestore _bind(this);
- glTexStorage2D(target, levels, ifmt, size, size);
+ glTexStorage2D(target, levels, storage_fmt, size, size);
+ apply_swizzle();
allocated |= (1<<levels)-1;
}
else
{
- PixelFormat base_fmt = get_base_pixelformat(ifmt);
- DataType type = get_alloc_type(base_fmt);
for(unsigned i=0; i<6; ++i)
- image(enumerate_faces(i), level, base_fmt, type, 0);
+ image(enumerate_faces(i), level, 0);
}
}
-void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
+void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
{
if(size==0)
throw invalid_operation("TextureCube::image");
throw out_of_range("TextureCube::image");
if(ARB_texture_storage)
- return sub_image(face, level, 0, 0, s, s, fmt, type, data);
+ return sub_image(face, level, 0, 0, s, s, data);
BindRestore _bind(this);
- glTexImage2D(face, level, ifmt, s, s, 0, get_upload_format(fmt), type, data);
- // XXX Allocation should be tracked per-face, but we'll run out of bits
- allocated |= 1<<level;
- if(gen_mipmap && level==0)
+ if(!allocated)
{
- // TODO Only do this once all faces are created
- auto_generate_mipmap();
- allocated |= (1<<get_n_levels())-1;
+ 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)
+ {
+ 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);
+
+ 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, PixelFormat fmt, DataType type, const void *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");
BindRestore _bind(this);
allocate(level);
- glTexSubImage2D(face, level, x, y, wd, ht, get_upload_format(fmt), type, data);
+ PixelComponents comp = get_components(storage_fmt);
+ DataType type = get_component_type(storage_fmt);
+ glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
- if(gen_mipmap && level==0)
- auto_generate_mipmap();
+ if(auto_gen_mipmap && level==0)
+ generate_mipmap();
}
-void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
+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)
{
unsigned w = img.get_width();
unsigned h = img.get_height();
- PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+ PixelFormat fmt = pixelformat_from_image(img);
if(size==0)
{
if(w!=h)
throw incompatible_data("TextureCube::image");
- storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+ storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
}
else if(w!=size || h!=size)
throw incompatible_data("TextureCube::image");
PixelStore pstore = PixelStore::from_image(img);
BindRestore _bind_ps(pstore);
- image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
+ 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, bool srgb)
+void TextureCube::image(const Graphics::Image &img, unsigned lv)
{
unsigned w = img.get_width();
unsigned h = img.get_height();
throw incompatible_data("TextureCube::image");
h /= 6;
- PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+ PixelFormat fmt = pixelformat_from_image(img);
if(size==0)
- {
- unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
- storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, l);
- }
+ storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, lv);
else if(w!=size || h!=size)
throw incompatible_data("TextureCube::image");
PixelStore pstore = PixelStore::from_image(img);
BindRestore _bind_ps(pstore);
- const char *cdata = reinterpret_cast<const char *>(img.get_data());
+ const char *pixels = reinterpret_cast<const char *>(img.get_pixels());
unsigned face_size = img.get_stride()*size;
for(unsigned i=0; i<6; ++i)
- image(enumerate_faces(i), 0, fmt, UNSIGNED_BYTE, cdata+i*face_size);
+ image(enumerate_faces(i), 0, pixels+i*face_size);
}
unsigned TextureCube::get_n_levels() const
UInt64 TextureCube::get_data_size() const
{
- return id ? size*size*6*get_pixel_size(ifmt) : 0;
+ return id ? size*size*6*get_pixel_size(storage_fmt) : 0;
}
add("image_data", &Loader::image_data);
add("raw_data", &Loader::raw_data);
add("storage", &Loader::storage);
+ add("storage", &Loader::storage_levels);
}
void TextureCube::Loader::external_image(TextureCubeFace face, const string &fn)
RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
img.load_io(*io);
- obj.image(face, img, srgb);
+ obj.image(face, img);
}
void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
IO::Memory mem(data.data(), data.size());
img.load_io(mem);
- obj.image(face, img, srgb);
+ obj.image(face, img);
}
void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
{
- obj.image(face, 0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+ obj.image(face, 0, data.data());
}
void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)
{
- if(srgb)
- fmt = get_srgb_pixelformat(fmt);
obj.storage(fmt, s);
}
+void TextureCube::Loader::storage_levels(PixelFormat fmt, unsigned s, unsigned l)
+{
+ obj.storage(fmt, s, l);
+}
+
void operator>>(const LexicalConverter &conv, TextureCubeFace &face)
{
projects / libs / gl.git / blobdiff