Implement sub_image for TextureCube also

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index d435a356a9ef3f215c6f11d912e1c76fade17959..4d3dac037291137856d28a77926e9517ac9475de 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,4 +1,3 @@
-#include <msp/io/memory.h>
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
@@ -51,6 +50,9 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
                throw invalid_operation("Texture2D::storage");
        if(wd==0 || ht==0)
                throw invalid_argument("Texture2D::storage");
+
+       if(MSP_sized_internal_formats)
+               fmt = get_sized_pixelformat(fmt);
        require_pixelformat(fmt);
 
        ifmt = fmt;
@@ -99,14 +101,6 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
        glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 }
 
-void Texture2D::load_image(const string &fn, bool srgb)
-{
-       Graphics::Image img;
-       img.load_file(fn);
-
-       image(img, srgb);
-}
-
 void Texture2D::image(const Graphics::Image &img, bool srgb)
 {
        image(img, srgb, false);
@@ -175,19 +169,8 @@ Texture2D::Loader::Loader(Texture2D &t, Collection &c):
 
 void Texture2D::Loader::init()
 {
-       add("image_data", &Loader::image_data);
        add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
-       add("storage", &Loader::storage_b);
-}
-
-void Texture2D::Loader::image_data(const string &data)
-{
-       Graphics::Image img;
-       IO::Memory mem(data.data(), data.size());
-       img.load_io(mem);
-
-       obj.image(img, srgb);
 }
 
 void Texture2D::Loader::raw_data(const string &data)
@@ -202,11 +185,6 @@ void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
        obj.storage(fmt, w, h);
 }
 
-void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
-{
-       storage(fmt, w, h);
-}
-
 
 Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
        texture(t),