#include <msp/datafile/collection.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>
allocated(0)
{
static Require _req(ARB_texture_cube_map);
+ if(ARB_seamless_cube_map)
+ glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
}
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");
{
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");
+ 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);