X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Ftexturecube_backend.cpp;h=142e343dd9984bb881148ee3dd66739c9cddf3e3;hb=HEAD;hp=2b9e09a9c90ecb9a0f27ce48b37e1b9ae747de97;hpb=f73e671dcb36c097647cddbf5b1eaaad2ffc9299;p=libs%2Fgl.git

diff --git a/source/backends/opengl/texturecube_backend.cpp b/source/backends/opengl/texturecube_backend.cpp
index 2b9e09a9..e363f6fb 100644
--- a/source/backends/opengl/texturecube_backend.cpp
+++ b/source/backends/opengl/texturecube_backend.cpp
@@ -28,8 +28,7 @@ OpenGLTextureCube::OpenGLTextureCube():
 
 void OpenGLTextureCube::allocate()
 {
-	unsigned size = static_cast<const TextureCube *>(this)->size;
-	unsigned levels = static_cast<const TextureCube *>(this)->levels;
+	const TextureCube &self = *static_cast<const TextureCube *>(this);
 
 	if(!id)
 		create();
@@ -38,11 +37,11 @@ void OpenGLTextureCube::allocate()
 	if(ARB_texture_storage)
 	{
 		if(ARB_direct_state_access)
-			glTextureStorage2D(id, levels, gl_fmt, size, size);
+			glTextureStorage2D(id, n_levels, gl_fmt, self.size, self.size);
 		else
 		{
 			bind_scratch();
-			glTexStorage2D(target, levels, gl_fmt, size, size);
+			glTexStorage2D(target, n_levels, gl_fmt, self.size, self.size);
 		}
 	}
 	else
@@ -50,13 +49,13 @@ void OpenGLTextureCube::allocate()
 		bind_scratch();
 		GLenum comp = get_gl_components(get_components(storage_fmt));
 		GLenum type = get_gl_type(get_component_type(storage_fmt));
-		for(unsigned i=0; i<levels; ++i)
+		for(unsigned i=0; i<n_levels; ++i)
 		{
 			unsigned lv_size = static_cast<const TextureCube *>(this)->get_level_size(i);
 			for(unsigned j=0; j<6; ++j)
 				glTexImage2D(get_gl_cube_face(j), i, gl_fmt, lv_size, lv_size, 0, comp, type, 0);
 		}
-		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, n_levels-1);
 	}
 
 	apply_swizzle();
@@ -77,8 +76,16 @@ void OpenGLTextureCube::sub_image(unsigned face, unsigned level, int x, int y, u
 
 size_t OpenGLTextureCube::get_data_size() const
 {
-	unsigned size = static_cast<const TextureCube *>(this)->size;
-	return id ? size*size*6*get_pixel_size(storage_fmt) : 0;
+	if(!id)
+		return 0;
+
+	const TextureCube &self = *static_cast<const TextureCube *>(this);
+
+	size_t level_size = self.size*self.size*get_pixel_size(storage_fmt);
+	size_t total_size = level_size;
+	for(unsigned i=0; i<n_levels; ++i, level_size>>=2)
+		total_size += level_size;
+	return total_size;
 }