X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.cpp;h=2db1b63b92162c358618c7c3d7a6a0831ce3cb5e;hb=e92de029768eef5f0fd744329e589161b46d0762;hp=93faa3703ab993ee29e05710347c56be82c3bca2;hpb=aff68a183a4b33653750acc57a021fd7ed6c555c;p=libs%2Fgl.git

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 93faa370..2db1b63b 100644
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -5,9 +5,7 @@
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/io/memory.h>
 #include <msp/strings/format.h>
-#include "bindable.h"
 #include "error.h"
-#include "pixelstore.h"
 #include "texturecube.h"
 
 using namespace std;
@@ -79,23 +77,39 @@ void TextureCube::allocate(unsigned level)
 		throw invalid_operation("TextureCube::allocate");
 	if(level>=levels)
 		throw invalid_argument("TextureCube::allocate");
+
+	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(allocated&(64<<level))
 		return;
 
 	if(ARB_texture_storage)
 	{
-		Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
+		GLenum fmt = get_gl_pixelformat(storage_fmt);
 		if(ARB_direct_state_access)
-			glTextureStorage2D(id, levels, storage_fmt, size, size);
+			glTextureStorage2D(id, levels, fmt, size, size);
 		else
-			glTexStorage2D(target, levels, storage_fmt, size, size);
+			glTexStorage2D(target, levels, fmt, size, size);
 		apply_swizzle();
 		allocated |= (64<<levels)-1;
 	}
 	else
 	{
 		for(unsigned i=0; i<6; ++i)
-			image(enumerate_faces(i), level, 0);
+			image_(enumerate_faces(i), level, 0);
 	}
 }
 
@@ -103,44 +117,54 @@ 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);
+	}
+
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(target, id);
 
-	BindRestore _bind(this);
+	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();
 	}
 
-	PixelComponents comp = get_components(storage_fmt);
+	unsigned lsz = get_level_size(level);
+	GLenum fmt = get_gl_pixelformat(storage_fmt);
+	GLenum comp = get_gl_components(get_components(storage_fmt));
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
-	glTexImage2D(face, level, storage_fmt, s, s, 0, comp, type, data);
+	glTexImage2D(face, level, 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, fmt, lsz, lsz, 0, comp, type, 0);
 
 		allocated |= 64<<level;
 	}
@@ -157,11 +181,19 @@ 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");
 
-	Conditional<BindRestore> _bind(!ARB_direct_state_acess, 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);
+	GLenum comp = get_gl_components(get_components(storage_fmt));
 	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);
@@ -169,7 +201,10 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 		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)
@@ -189,9 +224,6 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
 	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);
-
 	image(face, 0, img.get_pixels());
 }
 
@@ -215,9 +247,6 @@ void TextureCube::image(const Graphics::Image &img, unsigned lv)
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
 
-	PixelStore pstore = PixelStore::from_image(img);
-	BindRestore _bind_ps(pstore);
-
 	const char *pixels = reinterpret_cast<const char *>(img.get_pixels());
 	unsigned face_size = img.get_stride()*size;
 	for(unsigned i=0; i<6; ++i)