Prefer explicit mipmap generation with glGenerateMipmap

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

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index 046fca6fa4eccbe49a5a5174ba498adefc1b892c..e5a496a455095093c89502d15c3727dd7306ecec 100644 (file)
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -1,3 +1,4 @@
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/msp_texture1d.h>
 #include "bindable.h"
 #include "error.h"
@@ -23,6 +24,9 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd)
                throw invalid_operation("Texture1D::storage");
        if(wd==0)
                throw invalid_argument("Texture1D::storage");
+
+       if(MSP_sized_internal_formats)
+               fmt = get_sized_pixelformat(fmt);
        require_pixelformat(fmt);
 
        ifmt = fmt;
@@ -34,8 +38,18 @@ void Texture1D::allocate(unsigned level)
        if(allocated&(1<<level))
                return;
 
-       PixelFormat base_fmt = get_base_pixelformat(ifmt);
-       image(level, base_fmt, get_alloc_type(base_fmt), 0);
+       if(ARB_texture_storage)
+       {
+               BindRestore _bind(this);
+               unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+               glTexStorage1D(target, n_levels, ifmt, width);
+               allocated |= (1<<n_levels)-1;
+       }
+       else
+       {
+               PixelFormat base_fmt = get_base_pixelformat(ifmt);
+               image(level, base_fmt, get_alloc_type(base_fmt), 0);
+       }
 }
 
 void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -46,18 +60,56 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
        unsigned w = get_level_size(level);
 
        BindRestore _bind(this);
+       if(ARB_texture_storage)
+               return sub_image(level, 0, w, fmt, type, data);
+
        glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
 
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
        {
                auto_generate_mipmap();
-               for(; w; w>>=1, ++level) ;
-               allocated |= (1<<level)-1;
+               allocated |= (1<<get_n_levels())-1;
        }
 }
 
-unsigned Texture1D::get_level_size(unsigned level)
+void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, DataType type, const void *data)
+{
+       if(width==0)
+               throw invalid_operation("Texture3D::image");
+
+       allocate(level);
+
+       BindRestore _bind(this);
+       glTexSubImage1D(target, level, x, wd, fmt, type, data);
+
+       if(gen_mipmap && level==0)
+               auto_generate_mipmap();
+}
+
+void Texture1D::image(const Graphics::Image &img, bool srgb)
+{
+       if(img.get_height()!=1)
+               throw incompatible_data("Texture1D::image");
+
+       unsigned w = img.get_width();
+       PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+       if(width==0)
+               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+       else if(w!=width)
+               throw incompatible_data("Texture1D::image");
+
+       image(0, fmt, UNSIGNED_BYTE, img.get_data());
+}
+
+unsigned Texture1D::get_n_levels() const
+{
+       unsigned n = 0;
+       for(unsigned s=width; s; s>>=1, ++n) ;
+       return n;
+}
+
+unsigned Texture1D::get_level_size(unsigned level) const
 {
        return width>>level;
 }
@@ -67,5 +119,36 @@ UInt64 Texture1D::get_data_size() const
        return id ? width*get_pixel_size(ifmt) : 0;
 }
 
+
+Texture1D::Loader::Loader(Texture1D &t):
+       DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>(t)
+{
+       init();
+}
+
+Texture1D::Loader::Loader(Texture1D &t, Collection &c):
+       DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>(t, c)
+{
+       init();
+}
+
+void Texture1D::Loader::init()
+{
+       add("raw_data", &Loader::raw_data);
+       add("storage", &Loader::storage);
+}
+
+void Texture1D::Loader::raw_data(const string &data)
+{
+       obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+}
+
+void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
+{
+       if(srgb)
+               fmt = get_srgb_pixelformat(fmt);
+       obj.storage(fmt, w);
+}
+
 } // namespace GL
 } // namespace Msp