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

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index ae06557d..2db1b63b 100644
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -77,8 +77,6 @@ void TextureCube::allocate(unsigned level)
 		throw invalid_operation("TextureCube::allocate");
 	if(level>=levels)
 		throw invalid_argument("TextureCube::allocate");
-	if(allocated&(64<<level))
-		return;
 
 	bool direct = ARB_texture_storage && ARB_direct_state_access;
 	if(!direct)
@@ -95,12 +93,16 @@ void TextureCube::allocate(unsigned level)
 
 void TextureCube::allocate_(unsigned level)
 {
+	if(allocated&(64<<level))
+		return;
+
 	if(ARB_texture_storage)
 	{
+		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;
 	}
@@ -147,9 +149,10 @@ void TextureCube::image_(TextureCubeFace face, unsigned level, const void *data)
 	}
 
 	unsigned lsz = get_level_size(level);
-	PixelComponents comp = get_components(storage_fmt);
+	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, lsz, lsz, 0, comp, type, data);
+	glTexImage2D(face, level, fmt, lsz, lsz, 0, comp, type, data);
 
 	if(level==0)
 	{
@@ -161,7 +164,7 @@ void TextureCube::image_(TextureCubeFace face, unsigned level, const void *data)
 	{
 		for(unsigned i=0; i<6; ++i)
 			if(enumerate_faces(i)!=face)
-				glTexImage2D(enumerate_faces(i), level, storage_fmt, lsz, lsz, 0, comp, type, 0);
+				glTexImage2D(enumerate_faces(i), level, fmt, lsz, lsz, 0, comp, type, 0);
 
 		allocated |= 64<<level;
 	}
@@ -190,7 +193,7 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 
 	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);