Remove the separate allocation step from textures and buffers

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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 9db8b06150b110a525e8569a9ee0074badef7f51..03a64f1cf83abdf8b4de758f8f1c2a44075b74a8 100644 (file)
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -1,5 +1,4 @@
 #include <cmath>
-#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/ext_texture3d.h>
@@ -17,16 +16,14 @@ Texture3D::Texture3D(GLenum t):
        Texture(t),
        width(0),
        height(0),
-       depth(0),
-       allocated(0)
+       depth(0)
 { }
 
 Texture3D::Texture3D():
        Texture(GL_TEXTURE_3D),
        width(0),
        height(0),
-       depth(0),
-       allocated(0)
+       depth(0)
 {
        static Require _req(EXT_texture3D);
 }
@@ -49,95 +46,38 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp,
        levels = get_n_levels();
        if(lv>0)
                levels = min(levels, lv);
-}
 
-void Texture3D::allocate(unsigned level)
-{
-       if(width==0 || height==0 || depth==0)
-               throw invalid_operation("Texture3D::allocate");
-       if(level>=levels)
-               throw invalid_argument("Texture3D::allocate");
-       if(allocated&(1<<level))
-               return;
-
-       bool direct = ARB_texture_storage && ARB_direct_state_access;
-       if(!direct)
-       {
-               glActiveTexture(GL_TEXTURE0);
-               glBindTexture(target, id);
-       }
-
-       allocate_(level);
-
-       if(!direct)
-               glBindTexture(target, 0);
-}
-
-void Texture3D::allocate_(unsigned level)
-{
+       GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
        if(ARB_texture_storage)
        {
-               GLenum fmt = get_gl_pixelformat(storage_fmt);
                if(ARB_direct_state_access)
-                       glTextureStorage3D(id, levels, fmt, width, height, depth);
+                       glTextureStorage3D(id, levels, gl_fmt, width, height, depth);
                else
-                       glTexStorage3D(target, levels, fmt, width, height, depth);
-               apply_swizzle();
-               allocated |= (1<<levels)-1;
+               {
+                       bind_scratch();
+                       glTexStorage3D(target, levels, gl_fmt, width, height, depth);
+               }
        }
        else
-               image_(level, 0);
-}
-
-void Texture3D::image(unsigned level, const void *data)
-{
-       if(width==0 || height==0 || depth==0)
-               throw invalid_operation("Texture3D::image");
-       if(level>=levels)
-               throw out_of_range("Texture3D::image");
-
-       if(ARB_texture_storage)
-       {
-               LinAl::Vector<unsigned, 3> size = get_level_size(level);
-               return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
-       }
-
-       glActiveTexture(GL_TEXTURE0);
-       glBindTexture(target, id);
-
-       image_(level, data);
-
-       if(auto_gen_mipmap && level==0)
-       {
-               generate_mipmap_();
-               allocated |= (1<<levels)-1;
-       }
-
-       glBindTexture(target, 0);
-}
-
-void Texture3D::image_(unsigned level, const void *data)
-{
-       if(!allocated)
        {
+               bind_scratch();
+               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)
+               {
+                       LinAl::Vector<unsigned, 3> lv_size = get_level_size(i);
+                       glTexImage3D(target, i, gl_fmt, lv_size.x, lv_size.y, lv_size.z, 0, comp, type, 0);
+               }
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-               apply_swizzle();
        }
 
-       LinAl::Vector<unsigned, 3> size = get_level_size(level);
-       GLenum fmt = get_gl_pixelformat(storage_fmt);
-       GLenum comp = get_gl_components(get_components(storage_fmt));
-       GLenum type = get_gl_type(get_component_type(storage_fmt));
-       glTexImage3D(target, level, fmt, size.x, size.y, size.z, 0, comp, type, data);
-
-       allocated |= 1<<level;
+       apply_swizzle();
 }
 
-void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+void Texture3D::image(unsigned level, const void *data)
 {
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("Texture3D::image");
-       image(level, data);
+       LinAl::Vector<unsigned, 3> size = get_level_size(level);
+       return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
 }
 
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
@@ -147,34 +87,15 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
        if(level>=levels)
                throw out_of_range("Texture3D::sub_image");
 
-       bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
-       if(!direct)
-       {
-               glActiveTexture(GL_TEXTURE0);
-               glBindTexture(target, id);
-       }
-
-       allocate_(level);
-
        GLenum comp = get_gl_components(get_components(storage_fmt));
        GLenum type = get_gl_type(get_component_type(storage_fmt));
        if(ARB_direct_state_access)
                glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, comp, type, data);
        else
+       {
+               bind_scratch();
                glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
-
-       if(auto_gen_mipmap && level==0)
-               generate_mipmap_();
-
-       if(!direct)
-               glBindTexture(target, 0);
-}
-
-void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data)
-{
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("Texture3D::sub_image");
-       sub_image(level, x, y, z, wd, ht, dp, data);
+       }
 }
 
 void Texture3D::image(const Graphics::Image &img, unsigned lv)
@@ -221,7 +142,7 @@ LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
        return LinAl::Vector<unsigned, 3>(w, h, d);
 }
 
-UInt64 Texture3D::get_data_size() const
+uint64_t Texture3D::get_data_size() const
 {
        return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
 }