Use a scratch binding to modify textures and buffers

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

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 9ebc3cc5fc496e0e7afe057f12f26c7796637b10..ed0b206c1e05069ada3d8e677c84995b706e920b 100644 (file)
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -70,22 +70,6 @@ void Texture2D::allocate(unsigned level)
                throw invalid_operation("Texture2D::allocate");
        if(level>=levels)
                throw invalid_argument("Texture2D::allocate");
-
-       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 Texture2D::allocate_(unsigned level)
-{
        if(allocated&(1<<level))
                return;
 
@@ -95,12 +79,15 @@ void Texture2D::allocate_(unsigned level)
                if(ARB_direct_state_access)
                        glTextureStorage2D(id, levels, fmt, width, height);
                else
+               {
+                       bind_scratch();
                        glTexStorage2D(target, levels, fmt, width, height);
+               }
                apply_swizzle();
                allocated |= (1<<levels)-1;
        }
        else
-               image_(level, 0);
+               image(level, 0);
 }
 
 void Texture2D::image(unsigned level, const void *data)
@@ -110,41 +97,30 @@ void Texture2D::image(unsigned level, const void *data)
        if(level>=levels)
                throw out_of_range("Texture2D::image");
 
+       LinAl::Vector<unsigned, 2> size = get_level_size(level);
+
        if(ARB_texture_storage)
-       {
-               LinAl::Vector<unsigned, 2> size = get_level_size(level);
                return sub_image(level, 0, 0, size.x, size.y, 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);
-}
+       bind_scratch();
 
-void Texture2D::image_(unsigned level, const void *data)
-{
        if(!allocated)
        {
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
                apply_swizzle();
        }
 
-       LinAl::Vector<unsigned, 2> 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));
        glTexImage2D(target, level, fmt, size.x, size.y, 0, comp, type, data);
 
        allocated |= 1<<level;
+       if(auto_gen_mipmap && level==0)
+       {
+               generate_mipmap();
+               allocated |= (1<<levels)-1;
+       }
 }
 
 void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -161,27 +137,20 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
        if(level>=levels)
                throw out_of_range("Texture2D::sub_image");
 
-       bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
-       if(!direct)
-       {
-               glActiveTexture(GL_TEXTURE0);
-               glBindTexture(target, id);
-       }
-
-       allocate_(level);
+       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)
                glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
        else
+       {
+               bind_scratch();
                glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
+       }
 
        if(auto_gen_mipmap && level==0)
-               generate_mipmap_();
-
-       if(!direct)
-               glBindTexture(target, 0);
+               generate_mipmap();
 }
 
 void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)