Add check for more modern AMD video cards

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

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index d5453c182e128b13e201cb87d7b738e38caefd00..24d02f4022b2aeac380410ea481a2e392181f8af 100644 (file)
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -23,6 +23,7 @@ Vector3 TextureCube::directions[6] =
 
 TextureCube::TextureCube():
        Texture(GL_TEXTURE_CUBE_MAP),
+       ifmt(RGB),
        size(0),
        allocated(0)
 {
@@ -46,8 +47,10 @@ void TextureCube::allocate(unsigned level)
        if(allocated&(1<<level))
                return;
 
+       PixelFormat base_fmt = get_base_pixelformat(ifmt);
+       DataType type = get_alloc_type(base_fmt);
        for(unsigned i=0; i<6; ++i)
-               image(enumerate_faces(i), level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+               image(enumerate_faces(i), level, base_fmt, type, 0);
 }
 
 void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -66,22 +69,27 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
        {
+               // TODO Only do this once all faces are created
+               auto_generate_mipmap();
                for(; s; s>>=1, ++level) ;
                allocated |= (1<<level)-1;
        }
 }
 
-void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
+void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
 {
        unsigned w = img.get_width();
        unsigned h = img.get_height();
        PixelFormat fmt = pixelformat_from_graphics(img.get_format());
        if(size==0)
        {
-               if(w==h)
-                       storage(storage_pixelformat_from_graphics(img.get_format()), w);
-               else
+               if(w!=h)
                        throw incompatible_data("TextureCube::image");
+
+               PixelFormat f = storage_pixelformat_from_graphics(img.get_format());
+               if(srgb)
+                       f = get_srgb_pixelformat(f);
+               storage(f, w);
        }
        else if(w!=size || h!=size)
                throw incompatible_data("TextureCube::image");
@@ -163,9 +171,25 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
        return fv+s*sv+t*tv;
 }
 
+UInt64 TextureCube::get_data_size() const
+{
+       return id ? size*size*6*get_pixel_size(ifmt) : 0;
+}
+
 
 TextureCube::Loader::Loader(TextureCube &t):
        DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t)
+{
+       init();
+}
+
+TextureCube::Loader::Loader(TextureCube &t, Collection &c):
+       DataFile::DerivedObjectLoader<TextureCube, Texture::Loader>(t, c)
+{
+       init();
+}
+
+void TextureCube::Loader::init()
 {
        add("image_data", &Loader::image_data);
        add("raw_data", &Loader::raw_data);
@@ -178,7 +202,7 @@ void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
        IO::Memory mem(data.data(), data.size());
        img.load_io(mem);
 
-       obj.image(face, img);
+       obj.image(face, img, srgb);
 }
 
 void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
@@ -188,6 +212,8 @@ void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
 
 void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)
 {
+       if(srgb)
+               fmt = get_srgb_pixelformat(fmt);
        obj.storage(fmt, s);
 }