Remove the deprecated ProgramBuilder class

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

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index b50f8cf444c0c9fb1435ce97e756ffc1330b59c2..742857be725b4ed205b369c43d823f5b0812af14 100644 (file)
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -26,7 +26,7 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
        if(wd==0)
                throw invalid_argument("Texture1D::storage");
 
-       set_internal_format(fmt);
+       set_format(fmt);
        width = wd;
        levels = get_n_levels();
        if(lv)
@@ -46,20 +46,17 @@ void Texture1D::allocate(unsigned level)
        {
                Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
                if(ARB_direct_state_access)
-                       glTextureStorage1D(id, levels, ifmt, width);
+                       glTextureStorage1D(id, levels, storage_fmt, width);
                else
-                       glTexStorage1D(target, levels, ifmt, width);
+                       glTexStorage1D(target, levels, storage_fmt, width);
                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, 0);
 }
 
-void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
+void Texture1D::image(unsigned level, const void *data)
 {
        if(width==0)
                throw invalid_operation("Texture1D::image");
@@ -67,7 +64,7 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
        unsigned w = get_level_size(level);
 
        if(ARB_texture_storage)
-               return sub_image(level, 0, w, fmt, type, data);
+               return sub_image(level, 0, w, data);
 
        BindRestore _bind(this);
 
@@ -76,7 +73,10 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
                apply_swizzle();
        }
-       glTexImage1D(target, level, ifmt, w, 0, get_upload_format(fmt), type, data);
+
+       PixelComponents comp = get_components(storage_fmt);
+       DataType type = get_component_type(storage_fmt);
+       glTexImage1D(target, level, storage_fmt, w, 0, comp, type, data);
 
        allocated |= 1<<level;
        if(auto_gen_mipmap && level==0)
@@ -86,7 +86,14 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
        }
 }
 
-void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, DataType type, const void *data)
+void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+{
+       if(comp!=get_components(format) || type!=get_component_type(format))
+               throw incompatible_data("Texture1D::image");
+       image(level, data);
+}
+
+void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
 {
        if(width==0)
                throw invalid_operation("Texture3D::image");
@@ -94,29 +101,37 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, D
        Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
 
-       fmt = get_upload_format(fmt);
+       PixelComponents comp = get_components(storage_fmt);
+       DataType type = get_component_type(storage_fmt);
        if(ARB_direct_state_access)
-               glTextureSubImage1D(id, level, x, wd, fmt, type, data);
+               glTextureSubImage1D(id, level, x, wd, comp, type, data);
        else
-               glTexSubImage1D(target, level, x, wd, fmt, type, data);
+               glTexSubImage1D(target, level, x, wd, comp, type, data);
 
        if(auto_gen_mipmap && level==0)
                generate_mipmap();
 }
 
-void Texture1D::image(const Graphics::Image &img, unsigned lv, bool srgb)
+void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelComponents comp, DataType type, const void *data)
+{
+       if(comp!=get_components(format) || type!=get_component_type(format))
+               throw incompatible_data("Texture1D::sub_image");
+       sub_image(level, x, wd, data);
+}
+
+void Texture1D::image(const Graphics::Image &img, unsigned lv)
 {
        if(img.get_height()!=1)
                throw incompatible_data("Texture1D::image");
 
        unsigned w = img.get_width();
-       PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+       PixelFormat fmt = pixelformat_from_image(img);
        if(width==0)
-               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, lv);
+               storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, lv);
        else if(w!=width)
                throw incompatible_data("Texture1D::image");
 
-       image(0, fmt, UNSIGNED_BYTE, img.get_data());
+       image(0, img.get_pixels());
 }
 
 unsigned Texture1D::get_n_levels() const
@@ -133,7 +148,7 @@ unsigned Texture1D::get_level_size(unsigned level) const
 
 UInt64 Texture1D::get_data_size() const
 {
-       return id ? width*get_pixel_size(ifmt) : 0;
+       return id ? width*get_pixel_size(storage_fmt) : 0;
 }
 
 
@@ -158,7 +173,7 @@ void Texture1D::Loader::init()
 
 void Texture1D::Loader::raw_data(const string &data)
 {
-       obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+       obj.image(0, data.data());
 }
 
 void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)