From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 27 Oct 2016 22:52:13 +0000 (+0300)
Subject: Use ARB_texture_storage for defining texture storage
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=cb836adcf11f690188df9b7bc59f3fe87b67aaa7

Use ARB_texture_storage for defining texture storage
---

diff --git a/extensions/arb_texture_storage.glext b/extensions/arb_texture_storage.glext
new file mode 100644
index 00000000..c7526339
--- /dev/null
+++ b/extensions/arb_texture_storage.glext
@@ -0,0 +1 @@
+extension ARB_texture_storage
diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index 0dc85586..44e49f51 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -1,3 +1,4 @@
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/msp_texture1d.h>
 #include "bindable.h"
 #include "error.h"
@@ -37,8 +38,18 @@ void Texture1D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	PixelFormat base_fmt = get_base_pixelformat(ifmt);
-	image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	if(ARB_texture_storage)
+	{
+		BindRestore _bind(this);
+		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+		glTexStorage1D(target, n_levels, ifmt, width);
+		allocated |= (1<<n_levels)-1;
+	}
+	else
+	{
+		PixelFormat base_fmt = get_base_pixelformat(ifmt);
+		image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	}
 }
 
 void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -49,7 +60,10 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned w = get_level_size(level);
 
 	BindRestore _bind(this);
-	glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
+	if(ARB_texture_storage)
+		sub_image(level, 0, w, fmt, type, data);
+	else
+		glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 95f9f790..4aad82d2 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,3 +1,4 @@
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
@@ -65,8 +66,18 @@ void Texture2D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	PixelFormat base_fmt = get_base_pixelformat(ifmt);
-	image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	if(ARB_texture_storage)
+	{
+		BindRestore _bind(this);
+		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+		glTexStorage2D(target, n_levels, ifmt, width, height);
+		allocated |= (1<<n_levels)-1;
+	}
+	else
+	{
+		PixelFormat base_fmt = get_base_pixelformat(ifmt);
+		image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	}
 }
 
 void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -79,7 +90,10 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	get_level_size(level, w, h);
 
 	BindRestore _bind(this);
-	glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
+	if(ARB_texture_storage)
+		sub_image(level, 0, 0, w, h, fmt, type, data);
+	else
+		glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 12fc856b..d04a17e1 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,4 +1,5 @@
 #include <cmath>
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/graphics/image.h>
 #include "bindable.h"
@@ -53,8 +54,18 @@ void Texture3D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	PixelFormat base_fmt = get_base_pixelformat(ifmt);
-	image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	if(ARB_texture_storage)
+	{
+		BindRestore _bind(this);
+		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+		glTexStorage3D(target, n_levels, ifmt, width, height, depth);
+		allocated |= (1<<n_levels)-1;
+	}
+	else
+	{
+		PixelFormat base_fmt = get_base_pixelformat(ifmt);
+		image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	}
 }
 
 void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -68,7 +79,10 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	get_level_size(level, w, h, d);
 
 	BindRestore _bind(this);
-	glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+	if(ARB_texture_storage)
+		sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
+	else
+		glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 65b1845e..54a008ca 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -1,5 +1,6 @@
 #include <msp/datafile/collection.h>
 #include <msp/gl/extensions/arb_texture_cube_map.h>
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/io/memory.h>
 #include <msp/strings/format.h>
 #include "bindable.h"
@@ -51,10 +52,20 @@ void TextureCube::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	PixelFormat base_fmt = get_base_pixelformat(ifmt);
-	DataType type = get_alloc_type(base_fmt);
-	for(unsigned i=0; i<6; ++i)
-		image(enumerate_faces(i), level, base_fmt, type, 0);
+	if(ARB_texture_storage)
+	{
+		BindRestore _bind(this);
+		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+		glTexStorage2D(target, n_levels, ifmt, size, size);
+		allocated |= (1<<n_levels)-1;
+	}
+	else
+	{
+		PixelFormat base_fmt = get_base_pixelformat(ifmt);
+		DataType type = get_alloc_type(base_fmt);
+		for(unsigned i=0; i<6; ++i)
+			image(enumerate_faces(i), level, base_fmt, type, 0);
+	}
 }
 
 void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -67,7 +78,10 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 		throw out_of_range("TextureCube::image");
 
 	BindRestore _bind(this);
-	glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
+	if(ARB_texture_storage)
+		sub_image(face, level, 0, 0, s, s, fmt, type, data);
+	else
+		glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
 
 	// XXX Allocation should be tracked per-face, but we'll run out of bits
 	allocated |= 1<<level;