Prefer explicit mipmap generation with glGenerateMipmap

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

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 889d051b905e490dc9006f993a24fc476871d5c5..a9961af90a3900660f2e2c71a5a46be8820f6441 100644 (file)
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -1,5 +1,6 @@
 #include <msp/datafile/collection.h>
 #include <msp/gl/extensions/arb_texture_cube_map.h>
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/io/memory.h>
 #include <msp/strings/format.h>
 #include "bindable.h"
@@ -51,10 +52,20 @@ 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, base_fmt, type, 0);
+       if(ARB_texture_storage)
+       {
+               BindRestore _bind(this);
+               unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+               glTexStorage2D(target, n_levels, ifmt, size, size);
+               allocated |= (1<<n_levels)-1;
+       }
+       else
+       {
+               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, base_fmt, type, 0);
+       }
 }
 
 void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -67,6 +78,9 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
                throw out_of_range("TextureCube::image");
 
        BindRestore _bind(this);
+       if(ARB_texture_storage)
+               return sub_image(face, level, 0, 0, s, s, fmt, type, data);
+
        glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
 
        // XXX Allocation should be tracked per-face, but we'll run out of bits
@@ -75,11 +89,24 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
        {
                // TODO Only do this once all faces are created
                auto_generate_mipmap();
-               for(; s; s>>=1, ++level) ;
-               allocated |= (1<<level)-1;
+               allocated |= (1<<get_n_levels())-1;
        }
 }
 
+void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+{
+       if(size==0)
+               throw invalid_operation("TextureCube::sub_image");
+
+       allocate(level);
+
+       BindRestore _bind(this);
+       glTexSubImage2D(face, level, x, y, wd, ht, fmt, type, data);
+
+       if(gen_mipmap && level==0)
+               auto_generate_mipmap();
+}
+
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
 {
        unsigned w = img.get_width();
@@ -125,7 +152,14 @@ void TextureCube::image(const Graphics::Image &img, bool srgb)
                image(enumerate_faces(i), 0, fmt, UNSIGNED_BYTE, cdata+i*face_size);
 }
 
-unsigned TextureCube::get_level_size(unsigned level)
+unsigned TextureCube::get_n_levels() const
+{
+       unsigned n = 0;
+       for(unsigned s=size; s; s>>=1, ++n) ;
+       return n;
+}
+
+unsigned TextureCube::get_level_size(unsigned level) const
 {
        return size>>level;
 }