+#include <msp/datafile/collection.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"
throw invalid_operation("TextureCube::storage");
if(sz==0)
throw invalid_argument("TextureCube::storage");
+
+ if(MSP_sized_internal_formats)
+ fmt = get_sized_pixelformat(fmt);
require_pixelformat(fmt);
ifmt = fmt;
if(allocated&(1<<level))
return;
- for(unsigned i=0; i<6; ++i)
- image(enumerate_faces(i), level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+ if(ARB_texture_storage)
+ {
+ BindRestore _bind(this);
+ unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+ glTexStorage2D(target, n_levels, ifmt, size, size);
+ allocated |= (1<<n_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);
+ }
}
void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
if(s==0)
throw out_of_range("TextureCube::image");
+ if(ARB_texture_storage)
+ return sub_image(face, level, 0, 0, s, s, fmt, type, data);
+
BindRestore _bind(this);
glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
{
// TODO Only do this once all faces are created
auto_generate_mipmap();
- for(; s; s>>=1, ++level) ;
- allocated |= (1<<level)-1;
+ allocated |= (1<<get_n_levels())-1;
}
}
+void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+{
+ if(size==0)
+ throw invalid_operation("TextureCube::sub_image");
+
+ BindRestore _bind(this);
+ allocate(level);
+
+ glTexSubImage2D(face, level, x, y, wd, ht, fmt, type, data);
+
+ if(gen_mipmap && level==0)
+ auto_generate_mipmap();
+}
+
void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
{
unsigned w = img.get_width();
if(w!=h)
throw incompatible_data("TextureCube::image");
- PixelFormat f = storage_pixelformat_from_graphics(img.get_format());
- if(srgb)
- f = get_srgb_pixelformat(f);
- storage(f, w);
+ storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
}
else if(w!=size || h!=size)
throw incompatible_data("TextureCube::image");
image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
}
-unsigned TextureCube::get_level_size(unsigned level)
+void TextureCube::image(const Graphics::Image &img, bool srgb)
+{
+ unsigned w = img.get_width();
+ unsigned h = img.get_height();
+
+ if(h!=w*6)
+ throw incompatible_data("TextureCube::image");
+ h /= 6;
+
+ PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+ if(size==0)
+ storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+ 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());
+ 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);
+}
+
+unsigned TextureCube::get_n_levels() const
+{
+ unsigned n = 0;
+ for(unsigned s=size; s; s>>=1, ++n) ;
+ return n;
+}
+
+unsigned TextureCube::get_level_size(unsigned level) const
{
return size>>level;
}
void TextureCube::Loader::init()
{
+ add("external_image", &Loader::external_image);
add("image_data", &Loader::image_data);
add("raw_data", &Loader::raw_data);
add("storage", &Loader::storage);
}
+void TextureCube::Loader::external_image(TextureCubeFace face, const string &fn)
+{
+ Graphics::Image img;
+ RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
+ img.load_io(*io);
+
+ obj.image(face, img, srgb);
+}
+
void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
{
Graphics::Image img;