Deal with nontrivial image configurations

[libs/gl.git] / source / texture2d.cpp

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 0e9b40c6320d0a5514a9bde091abffe5cb131d69..7a9701f5e616f448465c1335f695b871d3d34d04 100644 (file)
--- 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());
 }