Prefer sized internal formats when possible

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

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 743eb986247eb95318c98490179b3fdb95683980..889d051b905e490dc9006f993a24fc476871d5c5 100644 (file)
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -1,3 +1,4 @@
+#include <msp/datafile/collection.h>
 #include <msp/gl/extensions/arb_texture_cube_map.h>
 #include <msp/io/memory.h>
 #include <msp/strings/format.h>
@@ -36,6 +37,9 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz)
                throw invalid_operation("TextureCube::storage");
        if(sz==0)
                throw invalid_argument("TextureCube::storage");
+
+       if(MSP_sized_internal_formats)
+               fmt = get_sized_pixelformat(fmt);
        require_pixelformat(fmt);
 
        ifmt = fmt;
@@ -212,11 +216,21 @@ TextureCube::Loader::Loader(TextureCube &t, Collection &c):
 
 void TextureCube::Loader::init()
 {
+       add("external_image", &Loader::external_image);
        add("image_data", &Loader::image_data);
        add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
 }
 
+void TextureCube::Loader::external_image(TextureCubeFace face, const string &fn)
+{
+       Graphics::Image img;
+       RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
+       img.load_io(*io);
+
+       obj.image(face, img, srgb);
+}
+
 void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
 {
        Graphics::Image img;