X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=03e65167d73fee7a1d89ba9ea3cea7ef2c68d81d;hp=65b1845eaf9ca5f1bb82f9886ada4ed0eed46472;hb=8e14c298d9eaa47b81e27d5c25174bda958b445f;hpb=e01371d38e290b4c526146fd5d1388bba8201233

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 65b1845e..03e65167 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -1,5 +1,6 @@
 #include <msp/datafile/collection.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 "bindable.h"
@@ -12,6 +13,16 @@ 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] =
 {
 	Vector3(1, 0, 0),
@@ -22,39 +33,60 @@ Vector3 TextureCube::directions[6] =
 	Vector3(0, 0, -1)
 };
 
+unsigned TextureCube::orientations[12] =
+{
+	5, 3,
+	4, 3,
+	0, 4,
+	0, 5,
+	0, 3,
+	1, 3
+};
+
 TextureCube::TextureCube():
 	Texture(GL_TEXTURE_CUBE_MAP),
-	ifmt(RGB),
 	size(0),
 	allocated(0)
 {
 	static Require _req(ARB_texture_cube_map);
 }
 
-void TextureCube::storage(PixelFormat fmt, unsigned sz)
+void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
 {
 	if(size>0)
 		throw invalid_operation("TextureCube::storage");
 	if(sz==0)
 		throw invalid_argument("TextureCube::storage");
 
-	if(MSP_sized_internal_formats)
-		fmt = get_sized_pixelformat(fmt);
-	require_pixelformat(fmt);
-
-	ifmt = fmt;
+	set_internal_format(fmt);
 	size = sz;
+	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&(1<<level))
 		return;
 
-	PixelFormat base_fmt = get_base_pixelformat(ifmt);
-	DataType type = get_alloc_type(base_fmt);
-	for(unsigned i=0; i<6; ++i)
-		image(enumerate_faces(i), level, base_fmt, type, 0);
+	if(ARB_texture_storage)
+	{
+		BindRestore _bind(this);
+		glTexStorage2D(target, levels, ifmt, size, size);
+		allocated |= (1<<levels)-1;
+	}
+	else
+	{
+		PixelFormat base_fmt = get_base_pixelformat(ifmt);
+		DataType type = get_alloc_type(base_fmt);
+		for(unsigned i=0; i<6; ++i)
+			image(enumerate_faces(i), level, base_fmt, type, 0);
+	}
 }
 
 void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -66,8 +98,11 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 	if(s==0)
 		throw out_of_range("TextureCube::image");
 
+	if(ARB_texture_storage)
+		return sub_image(face, level, 0, 0, s, s, fmt, type, data);
+
 	BindRestore _bind(this);
-	glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
+	glTexImage2D(face, level, ifmt, s, s, 0, get_upload_format(fmt), type, data);
 
 	// XXX Allocation should be tracked per-face, but we'll run out of bits
 	allocated |= 1<<level;
@@ -84,10 +119,13 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 	if(size==0)
 		throw invalid_operation("TextureCube::sub_image");
 
+	BindRestore _bind(this);
 	allocate(level);
 
-	BindRestore _bind(this);
-	glTexSubImage2D(face, level, x, y, wd, ht, fmt, type, data);
+	glTexSubImage2D(face, level, x, y, wd, ht, get_upload_format(fmt), type, data);
+
+	if(gen_mipmap && level==0)
+		auto_generate_mipmap();
 }
 
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
@@ -122,7 +160,10 @@ void TextureCube::image(const Graphics::Image &img, bool srgb)
 
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(size==0)
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+	{
+		unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, l);
+	}
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
 
@@ -149,58 +190,38 @@ unsigned TextureCube::get_level_size(unsigned level) const
 
 TextureCubeFace TextureCube::enumerate_faces(unsigned i)
 {
-	switch(i)
-	{
-	case 0: return POSITIVE_X;
-	case 1: return NEGATIVE_X;
-	case 2: return POSITIVE_Y;
-	case 3: return NEGATIVE_Y;
-	case 4: return POSITIVE_Z;
-	case 5: return NEGATIVE_Z;
-	default: throw out_of_range("TextureCube::enumerate_faces");
-	}
+	if(i>=6)
+		throw out_of_range("TextureCube::enumerate_faces");
+	return face_order[i];
 }
 
-const Vector3 &TextureCube::get_face_direction(TextureCubeFace face)
+unsigned TextureCube::get_face_index(TextureCubeFace face)
 {
 	switch(face)
 	{
-	case POSITIVE_X: return directions[0];
-	case NEGATIVE_X: return directions[1];
-	case POSITIVE_Y: return directions[2];
-	case NEGATIVE_Y: return directions[3];
-	case POSITIVE_Z: return directions[4];
-	case NEGATIVE_Z: return directions[5];
-	default: throw invalid_argument("TextureCube::get_face_direction");
+	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)];
+}
+
 const Vector3 &TextureCube::get_s_direction(TextureCubeFace face)
 {
-	switch(face)
-	{
-	case POSITIVE_X: return directions[5];
-	case NEGATIVE_X: return directions[4];
-	case POSITIVE_Y: return directions[0];
-	case NEGATIVE_Y: return directions[0];
-	case POSITIVE_Z: return directions[0];
-	case NEGATIVE_Z: return directions[1];
-	default: throw invalid_argument("TextureCube::get_s_direction");
-	}
+	return directions[orientations[get_face_index(face)*2]];
 }
 
 const Vector3 &TextureCube::get_t_direction(TextureCubeFace face)
 {
-	switch(face)
-	{
-	case POSITIVE_X: return directions[3];
-	case NEGATIVE_X: return directions[3];
-	case POSITIVE_Y: return directions[4];
-	case NEGATIVE_Y: return directions[5];
-	case POSITIVE_Z: return directions[3];
-	case NEGATIVE_Z: return directions[3];
-	default: throw invalid_argument("TextureCube::get_t_direction");
-	}
+	return directions[orientations[get_face_index(face)*2+1]];
 }
 
 Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsigned v)