X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=0dc85586cbc2e76c328077ca9b666b96c16873e9;hb=e01371d38e290b4c526146fd5d1388bba8201233;hp=f700d013b5dc6a55f88196695b8a8ec83b2242b9;hpb=4d7f66ea28c788e12f700216b9c53af9e71b8390;p=libs%2Fgl.git

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index f700d013..0dc85586 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -1,3 +1,4 @@
+#include <msp/gl/extensions/msp_texture1d.h>
 #include "bindable.h"
 #include "error.h"
 #include "texture1d.h"
@@ -12,7 +13,9 @@ Texture1D::Texture1D():
 	ifmt(RGB),
 	width(0),
 	allocated(0)
-{ }
+{
+	static Require _req(MSP_texture1D);
+}
 
 void Texture1D::storage(PixelFormat fmt, unsigned wd)
 {
@@ -20,6 +23,9 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd)
 		throw invalid_operation("Texture1D::storage");
 	if(wd==0)
 		throw invalid_argument("Texture1D::storage");
+
+	if(MSP_sized_internal_formats)
+		fmt = get_sized_pixelformat(fmt);
 	require_pixelformat(fmt);
 
 	ifmt = fmt;
@@ -31,7 +37,8 @@ void Texture1D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	image(level, base_fmt, get_alloc_type(base_fmt), 0);
 }
 
 void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -47,12 +54,45 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
-		for(; w; w>>=1, ++level) ;
-		allocated |= (1<<level)-1;
+		auto_generate_mipmap();
+		allocated |= (1<<get_n_levels())-1;
 	}
 }
 
-unsigned Texture1D::get_level_size(unsigned level)
+void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, DataType type, const void *data)
+{
+	if(width==0)
+		throw invalid_operation("Texture3D::image");
+
+	allocate(level);
+
+	BindRestore _bind(this);
+	glTexSubImage1D(target, level, x, wd, fmt, type, data);
+}
+
+void Texture1D::image(const Graphics::Image &img, bool srgb)
+{
+	if(img.get_height()!=1)
+		throw incompatible_data("Texture1D::image");
+
+	unsigned w = img.get_width();
+	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	if(width==0)
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+	else if(w!=width)
+		throw incompatible_data("Texture1D::image");
+
+	image(0, fmt, UNSIGNED_BYTE, img.get_data());
+}
+
+unsigned Texture1D::get_n_levels() const
+{
+	unsigned n = 0;
+	for(unsigned s=width; s; s>>=1, ++n) ;
+	return n;
+}
+
+unsigned Texture1D::get_level_size(unsigned level) const
 {
 	return width>>level;
 }
@@ -62,5 +102,36 @@ UInt64 Texture1D::get_data_size() const
 	return id ? width*get_pixel_size(ifmt) : 0;
 }
 
+
+Texture1D::Loader::Loader(Texture1D &t):
+	DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>(t)
+{
+	init();
+}
+
+Texture1D::Loader::Loader(Texture1D &t, Collection &c):
+	DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>(t, c)
+{
+	init();
+}
+
+void Texture1D::Loader::init()
+{
+	add("raw_data", &Loader::raw_data);
+	add("storage", &Loader::storage);
+}
+
+void Texture1D::Loader::raw_data(const string &data)
+{
+	obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+}
+
+void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
+{
+	if(srgb)
+		fmt = get_srgb_pixelformat(fmt);
+	obj.storage(fmt, w);
+}
+
 } // namespace GL
 } // namespace Msp