Tweak some texture allocation checks

Sub_image calls allocate_ internally, so it should avoid doing
unnecessary work.

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 9db8b06150b110a525e8569a9ee0074badef7f51..bdb87882e878333c23e88373bc85b57d277c7e74 100644 (file)
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -57,8 +57,6 @@ void Texture3D::allocate(unsigned level)
                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)
@@ -75,6 +73,9 @@ void Texture3D::allocate(unsigned level)
 
 void Texture3D::allocate_(unsigned level)
 {
+       if(allocated&(1<<level))
+               return;
+
        if(ARB_texture_storage)
        {
                GLenum fmt = get_gl_pixelformat(storage_fmt);

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 277cba6df35b821d4119060dc83ed64be1dc886c..2db1b63b92162c358618c7c3d7a6a0831ce3cb5e 100644 (file)
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -77,8 +77,6 @@ void TextureCube::allocate(unsigned level)
                throw invalid_operation("TextureCube::allocate");
        if(level>=levels)
                throw invalid_argument("TextureCube::allocate");
-       if(allocated&(64<<level))
-               return;
 
        bool direct = ARB_texture_storage && ARB_direct_state_access;
        if(!direct)
@@ -95,6 +93,9 @@ void TextureCube::allocate(unsigned level)
 
 void TextureCube::allocate_(unsigned level)
 {
+       if(allocated&(64<<level))
+               return;
+
        if(ARB_texture_storage)
        {
                GLenum fmt = get_gl_pixelformat(storage_fmt);