X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=f4af7e7259bef9ccaf3319be8c56df51cd9881a0;hb=49758ab622d2e8ed4b3a60d7b9afc4abd741300c;hp=7a9701f5e616f448465c1335f695b871d3d34d04;hpb=055f553b1a75f44e72f3c2b5a1c98c1e1e8f3f30;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 7a9701f5..f4af7e72 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -46,7 +46,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned h = height;
 	get_level_size(level, w, h);
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
 
 	allocated |= 1<<level;
@@ -64,7 +64,7 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 
 	allocate(level);
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 }
 
@@ -87,7 +87,7 @@ void Texture2D::image(const Graphics::Image &img)
 		throw incompatible_data("Texture2D::image");
 
 	PixelStore pstore = PixelStore::from_image(img);
-	Bind _bind_ps(pstore, true);
+	BindRestore _bind_ps(pstore);
 
 	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
@@ -124,7 +124,7 @@ void Texture2D::Loader::image_data(const string &data)
 
 void Texture2D::Loader::raw_data(const string &data)
 {
-	obj.image(0, obj.ifmt, UNSIGNED_BYTE, data.data());
+	obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
 }
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)