Use base pixelformat when loading texture data

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index dfd93f57c42e811a9c15c199083c50bd49d5497b..f4af7e7259bef9ccaf3319be8c56df51cd9881a0 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,5 +1,7 @@
+#include <msp/io/memory.h>
 #include "bindable.h"
 #include "error.h"
+#include "pixelstore.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -44,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;
@@ -62,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);
 }
 
@@ -80,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);
+       BindRestore _bind_ps(pstore);
+
        image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
@@ -111,14 +116,15 @@ Texture2D::Loader::Loader(Texture2D &t):
 void Texture2D::Loader::image_data(const string &data)
 {
        Graphics::Image img;
-       img.load_memory(data.data(), data.size());
+       IO::Memory mem(data.data(), data.size());
+       img.load_io(mem);
 
        obj.image(img);
 }
 
 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)