X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=e767423fe539f9ee92fd10dd5af8f1beaa6eebb4;hb=ac51b8c24d6e9e2c2e1dee7822f3957917722000;hp=65b1845eaf9ca5f1bb82f9886ada4ed0eed46472;hpb=e01371d38e290b4c526146fd5d1388bba8201233;p=libs%2Fgl.git

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 65b1845e..e767423f 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)
@@ -66,6 +77,9 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 	if(s==0)
 		throw out_of_range("TextureCube::image");
 
+	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);
 
@@ -84,10 +98,13 @@ 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)
+		auto_generate_mipmap();
 }
 
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)