Separate abstract pixel compositions from concrete pixel formats

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 94224147c70434b53bcb8ef9ea78328e9f81284b..8846a555d6437f6554c46e316a6f40be0b1c9728 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -72,23 +72,19 @@ void Texture2D::allocate(unsigned level)
 
        if(ARB_texture_storage)
        {
+               Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
                if(ARB_direct_state_access)
                        glTextureStorage2D(id, levels, ifmt, width, height);
                else
-               {
-                       BindRestore _bind(this);
                        glTexStorage2D(target, levels, ifmt, width, height);
-               }
+               apply_swizzle();
                allocated |= (1<<levels)-1;
        }
        else
-       {
-               PixelFormat base_fmt = get_base_pixelformat(ifmt);
-               image(level, base_fmt, get_alloc_type(base_fmt), 0);
-       }
+               image(level, get_components(ifmt), get_component_type(ifmt), 0);
 }
 
-void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
+void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
 {
        if(width==0 || height==0)
                throw invalid_operation("Texture2D::image");
@@ -98,20 +94,26 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
        get_level_size(level, w, h);
 
        if(ARB_texture_storage)
-               return sub_image(level, 0, 0, w, h, fmt, type, data);
+               return sub_image(level, 0, 0, w, h, comp, type, data);
 
        BindRestore _bind(this);
-       glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
+
+       if(!allocated)
+       {
+               glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+               apply_swizzle();
+       }
+       glTexImage2D(target, level, ifmt, w, h, 0, get_upload_components(comp), type, data);
 
        allocated |= 1<<level;
-       if(auto_gen_mipmap==1 && level==0)
+       if(auto_gen_mipmap && level==0)
        {
                generate_mipmap();
-               allocated |= (1<<get_n_levels())-1;
+               allocated |= (1<<levels)-1;
        }
 }
 
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
 {
        if(width==0 || height==0)
                throw invalid_operation("Texture2D::sub_image");
@@ -119,38 +121,37 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
        Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
 
-       fmt = get_upload_format(fmt);
+       comp = get_upload_components(comp);
        if(ARB_direct_state_access)
-               glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
+               glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
        else
-               glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+               glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
 
-       if(auto_gen_mipmap==1 && level==0)
+       if(auto_gen_mipmap && level==0)
                generate_mipmap();
 }
 
-void Texture2D::image(const Graphics::Image &img, bool srgb)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
-       image(img, srgb, false);
+       image(img, lv, srgb, false);
 }
 
-void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb, bool from_buffer)
 {
        unsigned w = img.get_width();
        unsigned h = img.get_height();
-       PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+       PixelFormat fmt = pixelformat_from_image(img);
+       PixelComponents comp = get_components(fmt);
+       DataType type = get_component_type(fmt);
        if(width==0)
-       {
-               unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
-               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, l);
-       }
-       else if(w!=width || h!=height)
+               storage(make_pixelformat(comp, type, srgb), w, h, lv);
+       else if(w!=width || h!=height || (lv && lv!=levels))
                throw incompatible_data("Texture2D::image");
 
        PixelStore pstore = PixelStore::from_image(img);
        BindRestore _bind_ps(pstore);
 
-       image(0, fmt, UNSIGNED_BYTE, from_buffer ? 0 : img.get_data());
+       image(0, comp, type, from_buffer ? 0 : img.get_data());
 }
 
 unsigned Texture2D::get_n_levels() const
@@ -188,8 +189,8 @@ void Texture2D::unload()
 {
        glDeleteTextures(1, &id);
        id = 0;
-       // TODO check which params actually need refreshing
-       dirty_params = -1;
+       allocated = 0;
+       default_sampler.unload();
 }
 
 
@@ -209,11 +210,12 @@ void Texture2D::Loader::init()
 {
        add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
+       add("storage", &Loader::storage_levels);
 }
 
 void Texture2D::Loader::raw_data(const string &data)
 {
-       obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+       obj.image(0, get_components(obj.ifmt), get_component_type(obj.ifmt), data.data());
 }
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
@@ -221,6 +223,11 @@ void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
        obj.storage(fmt, w, h);
 }
 
+void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, unsigned l)
+{
+       obj.storage(fmt, w, h, l);
+}
+
 
 Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
        texture(t),
@@ -252,8 +259,8 @@ bool Texture2D::AsyncLoader::process()
        }
        else if(phase==1)
        {
-               pixel_buffer.data(n_bytes, 0);
-               mapped_address = reinterpret_cast<char *>(pixel_buffer.map(WRITE_ONLY));
+               pixel_buffer.storage(n_bytes);
+               mapped_address = reinterpret_cast<char *>(pixel_buffer.map());
        }
        else if(phase==2)
        {
@@ -270,8 +277,13 @@ bool Texture2D::AsyncLoader::process()
                }
 
                if(!texture.id)
-                       glGenTextures(1, &texture.id);
-               texture.image(image, srgb_conversion, true);
+               {
+                       if(ARB_direct_state_access)
+                               glCreateTextures(texture.target, 1, &texture.id);
+                       else
+                               glGenTextures(1, &texture.id);
+               }
+               texture.image(image, 0, srgb_conversion, true);
        }
 
        ++phase;