Deal with nontrivial image configurations

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 73c4b817827cfef191e21079a982323a3d87363a..3d322d4b9bd9c14834097c81773c085e9bda7584 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -3,6 +3,7 @@
 #include <msp/graphics/image.h>
 #include "bindable.h"
 #include "error.h"
+#include "pixelstore.h"
 #include "texture3d.h"
 
 using namespace std;
@@ -110,11 +111,14 @@ void Texture3D::load_image(const string &fn, int dp)
 
        PixelFormat fmt = pixelformat_from_graphics(img.get_format());
        if(width==0)
-               storage(fmt, w, h, d);
+               storage(storage_pixelformat_from_graphics(img.get_format()), w, h, d);
        else if(w!=width || h!=height || d!=depth)
                throw incompatible_data("Texture3D::load_image");
 
-       image(0, fmt, UNSIGNED_INT, img.get_data());
+       PixelStore pstore = PixelStore::from_image(img);
+       Bind _bind_ps(pstore, true);
+
+       image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
 void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)