X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.cpp;h=4984985c807489b28d6f5737c2f2ba03286488d3;hb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;hp=6ec3662523dea02903e024bb9113b91125e4b711;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 6ec36625..4984985c 100644
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -1,4 +1,6 @@
 #include <msp/datafile/collection.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_seamless_cube_map.h>
 #include <msp/gl/extensions/arb_texture_cube_map.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/io/memory.h>
@@ -49,12 +51,18 @@ TextureCube::TextureCube():
 	allocated(0)
 {
 	static Require _req(ARB_texture_cube_map);
+	if(ARB_seamless_cube_map)
+		glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
 }
 
 void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
 {
 	if(size>0)
-		throw invalid_operation("TextureCube::storage");
+	{
+		if(fmt!=format || sz!=size || (lv && lv!=levels))
+			throw incompatible_data("TextureCube::storage");
+		return;
+	}
 	if(sz==0)
 		throw invalid_argument("TextureCube::storage");
 
@@ -74,17 +82,34 @@ void TextureCube::allocate(unsigned level)
 	if(allocated&(64<<level))
 		return;
 
+	bool direct = ARB_texture_storage && ARB_direct_state_access;
+	if(!direct)
+	{
+		glActiveTexture(GL_TEXTURE0);
+		glBindTexture(target, id);
+	}
+
+	allocate_(level);
+
+	if(!direct)
+		glBindTexture(target, 0);
+}
+
+void TextureCube::allocate_(unsigned level)
+{
 	if(ARB_texture_storage)
 	{
-		BindRestore _bind(this);
-		glTexStorage2D(target, levels, storage_fmt, size, size);
+		if(ARB_direct_state_access)
+			glTextureStorage2D(id, levels, storage_fmt, size, size);
+		else
+			glTexStorage2D(target, levels, storage_fmt, size, size);
 		apply_swizzle();
-		allocated |= (1<<levels)-1;
+		allocated |= (64<<levels)-1;
 	}
 	else
 	{
 		for(unsigned i=0; i<6; ++i)
-			image(enumerate_faces(i), level, 0);
+			image_(enumerate_faces(i), level, 0);
 	}
 }
 
@@ -92,44 +117,53 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 {
 	if(size==0)
 		throw invalid_operation("TextureCube::image");
-
-	unsigned s = get_level_size(level);
-	if(s==0)
+	if(level>=levels)
 		throw out_of_range("TextureCube::image");
 
 	if(ARB_texture_storage)
-		return sub_image(face, level, 0, 0, s, s, data);
+	{
+		unsigned lsz = get_level_size(level);
+		return sub_image(face, level, 0, 0, lsz, lsz, data);
+	}
 
-	BindRestore _bind(this);
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(target, id);
+
+	image_(face, level, data);
+
+	if(auto_gen_mipmap && level==0 && (allocated&63)==63)
+	{
+		generate_mipmap_();
+		allocated |= (64<<levels)-1;
+	}
 
+	glBindTexture(target, 0);
+}
+
+void TextureCube::image_(TextureCubeFace face, unsigned level, const void *data)
+{
 	if(!allocated)
 	{
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
 		apply_swizzle();
 	}
 
+	unsigned lsz = get_level_size(level);
 	PixelComponents comp = get_components(storage_fmt);
-	DataType type = get_component_type(storage_fmt);
-	glTexImage2D(face, level, storage_fmt, s, s, 0, comp, type, data);
+	GLenum type = get_gl_type(get_component_type(storage_fmt));
+	glTexImage2D(face, level, storage_fmt, lsz, lsz, 0, comp, type, data);
 
 	if(level==0)
 	{
 		allocated |= 1<<get_face_index(face);
 		if((allocated&63)==63)
-		{
 			allocated |= 64;
-			if(auto_gen_mipmap)
-			{
-				generate_mipmap();
-				allocated |= (64<<levels)-1;
-			}
-		}
 	}
 	else if(!(allocated&(64<<level)))
 	{
 		for(unsigned i=0; i<6; ++i)
 			if(enumerate_faces(i)!=face)
-				glTexImage2D(enumerate_faces(i), level, storage_fmt, s, s, 0, comp, type, 0);
+				glTexImage2D(enumerate_faces(i), level, storage_fmt, lsz, lsz, 0, comp, type, 0);
 
 		allocated |= 64<<level;
 	}
@@ -146,16 +180,30 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 {
 	if(size==0)
 		throw invalid_operation("TextureCube::sub_image");
+	if(level>=levels)
+		throw out_of_range("TextureCube::sub_image");
 
-	BindRestore _bind(this);
-	allocate(level);
+	bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
+	if(!direct)
+	{
+		glActiveTexture(GL_TEXTURE0);
+		glBindTexture(target, id);
+	}
+
+	allocate_(level);
 
 	PixelComponents comp = get_components(storage_fmt);
-	DataType type = get_component_type(storage_fmt);
-	glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
+	GLenum type = get_gl_type(get_component_type(storage_fmt));
+	if(ARB_direct_state_access)
+		glTextureSubImage3D(id, level, x, y, get_face_index(face), wd, ht, 1, comp, type, data);
+	else
+		glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
 
 	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
+		generate_mipmap_();
+
+	if(!direct)
+		glBindTexture(target, 0);
 }
 
 void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
@@ -169,17 +217,12 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
-	PixelFormat fmt = pixelformat_from_image(img);
-	if(size==0)
-	{
-		if(w!=h)
-			throw incompatible_data("TextureCube::image");
-
-		storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
-	}
-	else if(w!=size || h!=size)
+	if(w!=h)
 		throw incompatible_data("TextureCube::image");
 
+	PixelFormat fmt = pixelformat_from_image(img);
+	storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
+
 	PixelStore pstore = PixelStore::from_image(img);
 	BindRestore _bind_ps(pstore);