static Require _req(EXT_texture_array);
}
-void Texture2DArray::layer_image(unsigned level, unsigned z, PixelFormat fmt, DataType type, const void *data)
+void Texture2DArray::layer_image(unsigned level, unsigned z, const void *data)
{
unsigned w = get_width();
unsigned h = get_height();
unsigned d = get_depth();
get_level_size(level, w, h, d);
- sub_image(level, 0, 0, z, w, h, 1, fmt, type, data);
+ sub_image(level, 0, 0, z, w, h, 1, data);
+}
+
+void Texture2DArray::layer_image(unsigned level, unsigned z, PixelComponents comp, DataType type, const void *data)
+{
+ if(comp!=get_components(format) || type!=get_component_type(format))
+ throw incompatible_data("Texture2DArray::layer_image");
+ layer_image(level, z, data);
}
void Texture2DArray::layer_image(unsigned level, unsigned z, const Graphics::Image &img)
unsigned w = img.get_width();
unsigned h = img.get_height();
- PixelFormat fmt = pixelformat_from_graphics(img.get_format());
if(w!=get_width() || h!=get_height())
throw incompatible_data("Texture2DArray::layer_image");
+ PixelFormat fmt = pixelformat_from_image(img);
+ if(get_components(fmt)!=get_components(format) || get_component_type(fmt)!=get_component_type(format))
+ throw incompatible_data("Texture2DArray::layer_image");
PixelStore pstore = PixelStore::from_image(img);
BindRestore _bind_ps(pstore);
- layer_image(level, z, fmt, UNSIGNED_BYTE, img.get_data());
+ layer_image(level, z, img.get_data());
}