X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=7a9701f5e616f448465c1335f695b871d3d34d04;hb=e042e093a4761f1227d4dd80d695e01642e17ffd;hp=0e9b40c6320d0a5514a9bde091abffe5cb131d69;hpb=b5837545cf04e6f6313ef6874fa8fa000c0cda61;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 0e9b40c6..7a9701f5 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,6 +1,7 @@
 #include <msp/io/memory.h>
 #include "bindable.h"
 #include "error.h"
+#include "pixelstore.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -81,10 +82,13 @@ void Texture2D::image(const Graphics::Image &img)
 	unsigned h = img.get_height();
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-		storage(fmt, w, h);
+		storage(storage_pixelformat_from_graphics(img.get_format()), w, h);
 	else if(w!=width || h!=height)
 		throw incompatible_data("Texture2D::image");
 
+	PixelStore pstore = PixelStore::from_image(img);
+	Bind _bind_ps(pstore, true);
+
 	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }