X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2darray.cpp;h=1a085ed8e73bbe6c89c5361b7839a5fe32180c32;hp=c080481b106590f5a6a159be78ad1618142cf85f;hb=HEAD;hpb=2ba5af95fb7341b0e6b212e28d03208c6747aae5

diff --git a/source/texture2darray.cpp b/source/texture2darray.cpp
deleted file mode 100644
index c080481b..00000000
--- a/source/texture2darray.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <msp/datafile/collection.h>
-#include <msp/gl/extensions/ext_texture_array.h>
-#include "error.h"
-#include "pixelstore.h"
-#include "texture2darray.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-Texture2DArray::Texture2DArray():
-	Texture3D(GL_TEXTURE_2D_ARRAY)
-{
-	static Require _req(EXT_texture_array);
-}
-
-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, 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)
-{
-	if(!get_width())
-		throw invalid_operation("Texture2DArray::layer_image");
-
-	unsigned w = img.get_width();
-	unsigned h = img.get_height();
-	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, img.get_data());
-}
-
-
-Texture2DArray::Loader::Loader(Texture2DArray &t):
-	DataFile::DerivedObjectLoader<Texture2DArray, Texture3D::Loader>(t)
-{
-	init();
-}
-
-Texture2DArray::Loader::Loader(Texture2DArray &t, Collection &c):
-	DataFile::DerivedObjectLoader<Texture2DArray, Texture3D::Loader>(t, c)
-{
-	init();
-}
-
-void Texture2DArray::Loader::init()
-{
-	add("external_image", &Loader::external_image);
-}
-
-void Texture2DArray::Loader::external_image(unsigned z, const string &fn)
-{
-	Graphics::Image img;
-	RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
-	if(!io)
-		throw IO::file_not_found(fn);
-	img.load_io(*io);
-
-	obj.layer_image(0, z, img);
-}
-
-} // namespace GL
-} // namespace Msp