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

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 4984985c..516dca52 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;
@@ -15,7 +13,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-TextureCubeFace TextureCube::face_order[6] =
+const TextureCubeFace TextureCube::face_order[6] =
 {
 	POSITIVE_X,
 	NEGATIVE_X,
@@ -25,7 +23,7 @@ TextureCubeFace TextureCube::face_order[6] =
 	NEGATIVE_Z
 };
 
-Vector3 TextureCube::directions[6] =
+const Vector3 TextureCube::directions[6] =
 {
 	Vector3(1, 0, 0),
 	Vector3(-1, 0, 0),
@@ -35,7 +33,7 @@ Vector3 TextureCube::directions[6] =
 	Vector3(0, 0, -1)
 };
 
-unsigned TextureCube::orientations[12] =
+const unsigned TextureCube::orientations[12] =
 {
 	5, 3,
 	4, 3,
@@ -47,12 +45,18 @@ unsigned TextureCube::orientations[12] =
 
 TextureCube::TextureCube():
 	Texture(GL_TEXTURE_CUBE_MAP),
-	size(0),
-	allocated(0)
+	size(0)
 {
 	static Require _req(ARB_texture_cube_map);
 	if(ARB_seamless_cube_map)
-		glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
+	{
+		static bool seamless_init = false;
+		if(!seamless_init)
+		{
+			glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
+			seamless_init = true;
+		}
+	}
 }
 
 void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
@@ -71,109 +75,39 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
 	levels = get_n_levels();
 	if(lv>0)
 		levels = min(levels, lv);
-}
-
-void TextureCube::allocate(unsigned level)
-{
-	if(size==0)
-		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)
-	{
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(target, id);
-	}
-
-	allocate_(level);
-
-	if(!direct)
-		glBindTexture(target, 0);
-}
-
-void TextureCube::allocate_(unsigned level)
-{
+	GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
 	if(ARB_texture_storage)
 	{
 		if(ARB_direct_state_access)
-			glTextureStorage2D(id, levels, storage_fmt, size, size);
+			glTextureStorage2D(id, levels, gl_fmt, size, size);
 		else
-			glTexStorage2D(target, levels, storage_fmt, size, size);
-		apply_swizzle();
-		allocated |= (64<<levels)-1;
+		{
+			bind_scratch();
+			glTexStorage2D(target, levels, gl_fmt, size, size);
+		}
 	}
 	else
 	{
-		for(unsigned i=0; i<6; ++i)
-			image_(enumerate_faces(i), level, 0);
-	}
-}
-
-void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
-{
-	if(size==0)
-		throw invalid_operation("TextureCube::image");
-	if(level>=levels)
-		throw out_of_range("TextureCube::image");
-
-	if(ARB_texture_storage)
-	{
-		unsigned lsz = get_level_size(level);
-		return sub_image(face, level, 0, 0, lsz, lsz, data);
-	}
-
-	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)
-	{
+		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)
+		{
+			unsigned lv_size = get_level_size(i);
+			for(unsigned j=0; j<6; ++j)
+				glTexImage2D(enumerate_faces(j), i, gl_fmt, lv_size, lv_size, 0, comp, type, 0);
+		}
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-		apply_swizzle();
-	}
-
-	unsigned lsz = get_level_size(level);
-	PixelComponents comp = 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);
-
-	if(level==0)
-	{
-		allocated |= 1<<get_face_index(face);
-		if((allocated&63)==63)
-			allocated |= 64;
 	}
-	else if(!(allocated&(64<<level)))
-	{
-		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);
 
-		allocated |= 64<<level;
-	}
+	apply_swizzle();
 }
 
-void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data)
+void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 {
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("TextureCube::image");
-	image(face, level, data);
+	unsigned lsz = get_level_size(level);
+	return sub_image(face, level, 0, 0, lsz, lsz, data);
 }
 
 void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
@@ -183,34 +117,15 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 	if(level>=levels)
 		throw out_of_range("TextureCube::sub_image");
 
-	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);
 	else
+	{
+		bind_scratch();
 		glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
-
-	if(auto_gen_mipmap && level==0)
-		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)
-{
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("TextureCube::subimage");
-	sub_image(face, level, x, y, wd, ht, data);
+	}
 }
 
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
@@ -223,17 +138,9 @@ 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());
 }
 
-void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool)
-{
-	image(face, img);
-}
-
 void TextureCube::image(const Graphics::Image &img, unsigned lv)
 {
 	unsigned w = img.get_width();
@@ -249,9 +156,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)
@@ -316,7 +220,7 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
 	return fv+s*sv+t*tv;
 }
 
-UInt64 TextureCube::get_data_size() const
+uint64_t TextureCube::get_data_size() const
 {
 	return id ? size*size*6*get_pixel_size(storage_fmt) : 0;
 }