From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 28 Oct 2016 12:21:03 +0000 (+0300)
Subject: Rearrange texture bind calls to keep them closer to where they're needed
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=194f960f91041ebee44e2745627d5e480e893d82;p=libs%2Fgl.git

Rearrange texture bind calls to keep them closer to where they're needed
---

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index e5a496a4..ed7d8f6e 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -59,10 +59,10 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 
 	unsigned w = get_level_size(level);
 
-	BindRestore _bind(this);
 	if(ARB_texture_storage)
 		return sub_image(level, 0, w, fmt, type, data);
 
+	BindRestore _bind(this);
 	glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
 
 	allocated |= 1<<level;
@@ -78,9 +78,9 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, D
 	if(width==0)
 		throw invalid_operation("Texture3D::image");
 
+	BindRestore _bind(this);
 	allocate(level);
 
-	BindRestore _bind(this);
 	glTexSubImage1D(target, level, x, wd, fmt, type, data);
 
 	if(gen_mipmap && level==0)
diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 4d6e32f5..23cb9477 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -89,10 +89,10 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned h = height;
 	get_level_size(level, w, h);
 
-	BindRestore _bind(this);
 	if(ARB_texture_storage)
 		return sub_image(level, 0, 0, w, h, fmt, type, data);
 
+	BindRestore _bind(this);
 	glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
 
 	allocated |= 1<<level;
@@ -108,9 +108,9 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	if(width==0 || height==0)
 		throw invalid_operation("Texture2D::sub_image");
 
+	BindRestore _bind(this);
 	allocate(level);
 
-	BindRestore _bind(this);
 	glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 
 	if(gen_mipmap && level==0)
diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 7ea17b13..36afa9bc 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -78,10 +78,10 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned d = depth;
 	get_level_size(level, w, h, d);
 
-	BindRestore _bind(this);
 	if(ARB_texture_storage)
 		return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
 
+	BindRestore _bind(this);
 	glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
 
 	allocated |= 1<<level;
@@ -97,9 +97,9 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 	if(width==0 || height==0 || depth==0)
 		throw invalid_operation("Texture3D::image");
 
+	BindRestore _bind(this);
 	allocate(level);
 
-	BindRestore _bind(this);
 	glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
 
 	if(gen_mipmap && level==0)
diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index a9961af9..e767423f 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -77,10 +77,10 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 	if(s==0)
 		throw out_of_range("TextureCube::image");
 
-	BindRestore _bind(this);
 	if(ARB_texture_storage)
 		return sub_image(face, level, 0, 0, s, s, fmt, type, data);
 
+	BindRestore _bind(this);
 	glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
 
 	// XXX Allocation should be tracked per-face, but we'll run out of bits
@@ -98,9 +98,9 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 	if(size==0)
 		throw invalid_operation("TextureCube::sub_image");
 
+	BindRestore _bind(this);
 	allocate(level);
 
-	BindRestore _bind(this);
 	glTexSubImage2D(face, level, x, y, wd, ht, fmt, type, data);
 
 	if(gen_mipmap && level==0)