Rewrite state management

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

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 543bb9d40ec00e954ce894d9699e86c364405dd8..4984985c807489b28d6f5737c2f2ba03286488d3 100644 (file)
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -82,9 +82,23 @@ void TextureCube::allocate(unsigned level)
        if(allocated&(64<<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 TextureCube::allocate_(unsigned level)
+{
        if(ARB_texture_storage)
        {
-               Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
                if(ARB_direct_state_access)
                        glTextureStorage2D(id, levels, storage_fmt, size, size);
                else
@@ -95,7 +109,7 @@ void TextureCube::allocate(unsigned level)
        else
        {
                for(unsigned i=0; i<6; ++i)
-                       image(enumerate_faces(i), level, 0);
+                       image_(enumerate_faces(i), level, 0);
        }
 }
 
@@ -106,41 +120,50 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
        if(level>=levels)
                throw out_of_range("TextureCube::image");
 
-       unsigned s = get_level_size(level);
-
        if(ARB_texture_storage)
-               return sub_image(face, level, 0, 0, s, s, data);
+       {
+               unsigned lsz = get_level_size(level);
+               return sub_image(face, level, 0, 0, lsz, lsz, data);
+       }
+
+       glActiveTexture(GL_TEXTURE0);
+       glBindTexture(target, id);
 
-       BindRestore _bind(this);
+       image_(face, level, data);
 
+       if(auto_gen_mipmap && level==0 && (allocated&63)==63)
+       {
+               generate_mipmap_();
+               allocated |= (64<<levels)-1;
+       }
+
+       glBindTexture(target, 0);
+}
+
+void TextureCube::image_(TextureCubeFace face, unsigned level, const void *data)
+{
        if(!allocated)
        {
                glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
                apply_swizzle();
        }
 
+       unsigned lsz = get_level_size(level);
        PixelComponents comp = get_components(storage_fmt);
        GLenum type = get_gl_type(get_component_type(storage_fmt));
-       glTexImage2D(face, level, storage_fmt, s, s, 0, comp, type, data);
+       glTexImage2D(face, level, storage_fmt, lsz, lsz, 0, comp, type, data);
 
        if(level==0)
        {
                allocated |= 1<<get_face_index(face);
                if((allocated&63)==63)
-               {
                        allocated |= 64;
-                       if(auto_gen_mipmap)
-                       {
-                               generate_mipmap();
-                               allocated |= (64<<levels)-1;
-                       }
-               }
        }
        else if(!(allocated&(64<<level)))
        {
                for(unsigned i=0; i<6; ++i)
                        if(enumerate_faces(i)!=face)
-                               glTexImage2D(enumerate_faces(i), level, storage_fmt, s, s, 0, comp, type, 0);
+                               glTexImage2D(enumerate_faces(i), level, storage_fmt, lsz, lsz, 0, comp, type, 0);
 
                allocated |= 64<<level;
        }
@@ -160,8 +183,14 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
        if(level>=levels)
                throw out_of_range("TextureCube::sub_image");
 
-       Conditional<BindRestore> _bind(!ARB_direct_state_acess, this);
-       allocate(level);
+       bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
+       if(!direct)
+       {
+               glActiveTexture(GL_TEXTURE0);
+               glBindTexture(target, id);
+       }
+
+       allocate_(level);
 
        PixelComponents comp = get_components(storage_fmt);
        GLenum type = get_gl_type(get_component_type(storage_fmt));
@@ -171,7 +200,10 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
                glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
 
        if(auto_gen_mipmap && level==0)
-               generate_mipmap();
+               generate_mipmap_();
+
+       if(!direct)
+               glBindTexture(target, 0);
 }
 
 void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)