X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.cpp;h=9aec4b1d19640f699adbf8c2596a7e14555b6200;hp=277cba6df35b821d4119060dc83ed64be1dc886c;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=33b6ca811172d402fc891eeed9cd2a5edc28d61d

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 277cba6d..9aec4b1d 100644
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -1,8 +1,4 @@
 #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>
 #include <msp/strings/format.h>
 #include "error.h"
@@ -13,17 +9,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-TextureCubeFace TextureCube::face_order[6] =
-{
-	POSITIVE_X,
-	NEGATIVE_X,
-	POSITIVE_Y,
-	NEGATIVE_Y,
-	POSITIVE_Z,
-	NEGATIVE_Z
-};
-
-Vector3 TextureCube::directions[6] =
+const Vector3 TextureCube::directions[6] =
 {
 	Vector3(1, 0, 0),
 	Vector3(-1, 0, 0),
@@ -33,7 +19,7 @@ Vector3 TextureCube::directions[6] =
 	Vector3(0, 0, -1)
 };
 
-unsigned TextureCube::orientations[12] =
+const unsigned TextureCube::orientations[12] =
 {
 	5, 3,
 	4, 3,
@@ -43,16 +29,6 @@ unsigned TextureCube::orientations[12] =
 	1, 3
 };
 
-TextureCube::TextureCube():
-	Texture(GL_TEXTURE_CUBE_MAP),
-	size(0),
-	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)
@@ -69,111 +45,14 @@ 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)
-{
-	if(ARB_texture_storage)
-	{
-		GLenum fmt = get_gl_pixelformat(storage_fmt);
-		if(ARB_direct_state_access)
-			glTextureStorage2D(id, levels, fmt, size, size);
-		else
-			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);
-	}
+	allocate();
 }
 
 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)
-	{
-		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-		apply_swizzle();
-	}
-
 	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, 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, fmt, lsz, lsz, 0, comp, type, 0);
-
-		allocated |= 64<<level;
-	}
-}
-
-void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data)
-{
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("TextureCube::image");
-	image(face, level, data);
+	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 +62,7 @@ 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);
-
-	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
-		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);
+	TextureCubeBackend::sub_image(face, level, x, y, wd, ht, data);
 }
 
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
@@ -220,17 +72,10 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
 	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);
-
+	storage(pixelformat_from_image(img, use_srgb_format), w);
 	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();
@@ -240,16 +85,15 @@ void TextureCube::image(const Graphics::Image &img, unsigned lv)
 		throw incompatible_data("TextureCube::image");
 	h /= 6;
 
-	PixelFormat fmt = pixelformat_from_image(img);
 	if(size==0)
-		storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, lv);
+		storage(pixelformat_from_image(img, use_srgb_format), w, lv);
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
 
 	const char *pixels = reinterpret_cast<const char *>(img.get_pixels());
 	unsigned face_size = img.get_stride()*size;
 	for(unsigned i=0; i<6; ++i)
-		image(enumerate_faces(i), 0, pixels+i*face_size);
+		image(static_cast<TextureCubeFace>(i), 0, pixels+i*face_size);
 }
 
 unsigned TextureCube::get_n_levels() const
@@ -264,40 +108,19 @@ unsigned TextureCube::get_level_size(unsigned level) const
 	return size>>level;
 }
 
-TextureCubeFace TextureCube::enumerate_faces(unsigned i)
-{
-	if(i>=6)
-		throw out_of_range("TextureCube::enumerate_faces");
-	return face_order[i];
-}
-
-unsigned TextureCube::get_face_index(TextureCubeFace face)
-{
-	switch(face)
-	{
-	case POSITIVE_X: return 0;
-	case NEGATIVE_X: return 1;
-	case POSITIVE_Y: return 2;
-	case NEGATIVE_Y: return 3;
-	case POSITIVE_Z: return 4;
-	case NEGATIVE_Z: return 5;
-	default: throw invalid_argument("TextureCube::get_face_index");
-	}
-}
-
 const Vector3 &TextureCube::get_face_direction(TextureCubeFace face)
 {
-	return directions[get_face_index(face)];
+	return directions[face];
 }
 
 const Vector3 &TextureCube::get_s_direction(TextureCubeFace face)
 {
-	return directions[orientations[get_face_index(face)*2]];
+	return directions[orientations[face*2]];
 }
 
 const Vector3 &TextureCube::get_t_direction(TextureCubeFace face)
 {
-	return directions[orientations[get_face_index(face)*2+1]];
+	return directions[orientations[face*2+1]];
 }
 
 Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsigned v)
@@ -310,7 +133,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;
 }