X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=d5badc725435fb3efb37d4c15c52bedafd40ece6;hb=f9d27a44f11dcb2980ea7c65d410e9002098487f;hp=6515946bb2bba5885dd6dd6d5c425438804cc400;hpb=cd446554e998204eaba22504b7b28227feb8edbb;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 6515946b..d5badc72 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,17 +1,10 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <cmath>
-#include <msp/gbase/image.h>
+#include <msp/gl/extensions/ext_texture3d.h>
+#include <msp/graphics/image.h>
 #include "bindable.h"
-#include "except.h"
-#include "extension.h"
+#include "error.h"
+#include "pixelstore.h"
 #include "texture3d.h"
-#include "version_1_2.h"
 
 using namespace std;
 
@@ -20,27 +13,27 @@ namespace GL {
 
 Texture3D::Texture3D():
 	Texture(GL_TEXTURE_3D),
+	ifmt(RGB),
 	width(0),
 	height(0),
 	depth(0),
 	allocated(0)
 {
-	static RequireVersion _ver(1, 2);
+	static Require _req(EXT_texture3D);
 }
 
-void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d)
+void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
 {
 	if(width>0)
-		throw InvalidState("Textures storage may only be specified once");
-	if(w==0 || h==0 || d==0)
-		throw InvalidParameterValue("Invalid texture dimensions");
-
-	width = w;
-	height = h;
-	depth = d;
-	ifmt = f;
-
-	image(0, ifmt, UNSIGNED_BYTE, 0);
+		throw invalid_operation("Texture3D::storage");
+	if(wd==0 || ht==0 || dp==0)
+		throw invalid_argument("Texture3D::storage");
+	require_pixelformat(fmt);
+
+	width = wd;
+	height = ht;
+	depth = dp;
+	ifmt = fmt;
 }
 
 void Texture3D::allocate(unsigned level)
@@ -48,24 +41,27 @@ void Texture3D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
-	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+	PixelFormat base_fmt = get_base_pixelformat(ifmt);
+	image(level, base_fmt, get_alloc_type(base_fmt), 0);
 }
 
 void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
 {
-	require_storage();
+	if(width==0 || height==0 || depth==0)
+		throw invalid_operation("Texture3D::image");
 
 	unsigned w = width;
 	unsigned h = height;
 	unsigned d = depth;
 	get_level_size(level, w, h, d);
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
+		auto_generate_mipmap();
 		for(; (w || h || d); w>>=1, h>>=1, d>>=1, ++level) ;
 		allocated |= (1<<level)-1;
 	}
@@ -73,10 +69,12 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelFormat fmt, DataType type, const void *data)
 {
-	require_storage();
+	if(width==0 || height==0 || depth==0)
+		throw invalid_operation("Texture3D::image");
+
 	allocate(level);
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
 }
 
@@ -92,7 +90,7 @@ void Texture3D::load_image(const string &fn, int dp)
 	if(dp==-1)
 	{
 		if(h%w)
-			throw IncompatibleData("Image height is not divisible by its width");
+			throw incompatible_data("Texture3D::load_image");
 		d = h/w;
 		h = w;
 	}
@@ -101,25 +99,29 @@ void Texture3D::load_image(const string &fn, int dp)
 		for(d=h; d*d>h; d>>=2) ;
 		for(; d*d<h; ++d) ;
 		if(d*d!=h)
-			throw IncompatibleData("Could not find a square root of texture height");
+			throw incompatible_data("Texture3D::load_image");
 		h = d;
 	}
 	else if(dp>0)
+	{
 		d = dp;
+		if(h%d)
+			throw incompatible_data("Texture3D::load_image");
+		h /= d;
+	}
+	else
+		throw invalid_argument("Texture3D::load_image");
 
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-		storage(fmt, w, h, d);
+		storage(storage_pixelformat_from_graphics(img.get_format()), w, h, d);
 	else if(w!=width || h!=height || d!=depth)
-		throw IncompatibleData("Image does not match texture storage");
+		throw incompatible_data("Texture3D::load_image");
 
-	image(0, fmt, UNSIGNED_INT, img.get_data());
-}
+	PixelStore pstore = PixelStore::from_image(img);
+	BindRestore _bind_ps(pstore);
 
-void Texture3D::require_storage()
-{
-	if(width==0 || height==0 || depth==0)
-		throw InvalidState("Texture storage has not been specified");
+	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
 void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
@@ -136,5 +138,10 @@ void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigne
 		d = 1;
 }
 
+UInt64 Texture3D::get_data_size() const
+{
+	return id ? width*height*depth*get_pixel_size(ifmt) : 0;
+}
+
 } // namespace GL
 } // namespace Msp