Remove the separate allocation step from textures and buffers

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

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index d472527c92322f4d05b0fe39640f7f91905133a9..3fd1ae0955e88c1d432219506fe960db9e4ecdd2 100644 (file)
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -1,8 +1,6 @@
-#include <msp/core/raii.h>
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/msp_texture1d.h>
-#include "bindable.h"
 #include "error.h"
 #include "texture1d.h"
 
@@ -13,8 +11,7 @@ namespace GL {
 
 Texture1D::Texture1D():
        Texture(GL_TEXTURE_1D),
-       width(0),
-       allocated(0)
+       width(0)
 {
        static Require _req(MSP_texture1D);
 }
@@ -35,92 +32,52 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
        levels = get_n_levels();
        if(lv)
                levels = min(levels, lv);
-}
-
-void Texture1D::allocate(unsigned level)
-{
-       if(width==0)
-               throw invalid_operation("Texture1D::allocate");
-       if(level>=levels)
-               throw invalid_argument("Texture1D::allocate");
-       if(allocated&(1<<level))
-               return;
 
+       GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
        if(ARB_texture_storage)
        {
-               Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
                if(ARB_direct_state_access)
-                       glTextureStorage1D(id, levels, storage_fmt, width);
+                       glTextureStorage1D(id, levels, gl_fmt, width);
                else
-                       glTexStorage1D(target, levels, storage_fmt, width);
-               apply_swizzle();
-               allocated |= (1<<levels)-1;
+               {
+                       bind_scratch();
+                       glTexStorage1D(target, levels, gl_fmt, width);
+               }
        }
        else
-               image(level, 0);
-}
-
-void Texture1D::image(unsigned level, const void *data)
-{
-       if(width==0)
-               throw invalid_operation("Texture1D::image");
-
-       unsigned w = get_level_size(level);
-
-       if(ARB_texture_storage)
-               return sub_image(level, 0, w, data);
-
-       BindRestore _bind(this);
-
-       if(!allocated)
        {
+               bind_scratch();
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-               apply_swizzle();
+               GLenum comp = get_gl_components(get_components(storage_fmt));
+               GLenum type = get_gl_type(get_component_type(storage_fmt));
+               for(unsigned i=0; i<levels; ++i)
+                       glTexImage1D(target, i, gl_fmt, get_level_size(i), 0, comp, type, 0);
        }
 
-       PixelComponents comp = get_components(storage_fmt);
-       GLenum type = get_gl_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)
-       {
-               generate_mipmap();
-               allocated |= (1<<levels)-1;
-       }
+       apply_swizzle();
 }
 
-void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+void Texture1D::image(unsigned level, const void *data)
 {
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("Texture1D::image");
-       image(level, data);
+       return sub_image(level, 0, get_level_size(level), data);
 }
 
 void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
 {
        if(width==0)
-               throw invalid_operation("Texture3D::image");
-
-       Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
-       allocate(level);
+               throw invalid_operation("Texture1D::sub_image");
+       if(level>=levels)
+               throw out_of_range("Texture1D::sub_image");
 
-       PixelComponents comp = get_components(storage_fmt);
+       GLenum comp = get_gl_components(get_components(storage_fmt));
        GLenum type = get_gl_type(get_component_type(storage_fmt));
        if(ARB_direct_state_access)
                glTextureSubImage1D(id, level, x, wd, comp, type, data);
        else
+       {
+               bind_scratch();
                glTexSubImage1D(target, level, x, wd, comp, type, data);
-
-       if(auto_gen_mipmap && level==0)
-               generate_mipmap();
-}
-
-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)
@@ -147,7 +104,7 @@ unsigned Texture1D::get_level_size(unsigned level) const
        return width>>level;
 }
 
-UInt64 Texture1D::get_data_size() const
+uint64_t Texture1D::get_data_size() const
 {
        return id ? width*get_pixel_size(storage_fmt) : 0;
 }