From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 13 Sep 2021 16:59:07 +0000 (+0300)
Subject: Tweak some texture allocation checks
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=a0538cdd026622f7f0f3e2ac1f9c2bd54c4a6014

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 9db8b061..bdb87882 100644
--- 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 277cba6d..2db1b63b 100644
--- 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);