X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=61c745bb95bf4d8ae3df56c1c94c7aec43a686f7;hb=922fac753e31d97fc88daa166e93e4c5572bd2ba;hp=0ad65f8887437da0bf1283c93ed00b7628efdc36;hpb=6afbace895a7bbcf216ab8e48280ea0303ab5892;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 0ad65f88..61c745bb 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,8 +1,9 @@
 #include <cmath>
+#include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/graphics/image.h>
 #include "bindable.h"
 #include "error.h"
-#include "ext_texture3d.h"
+#include "pixelstore.h"
 #include "texture3d.h"
 
 using namespace std;
@@ -12,6 +13,7 @@ namespace GL {
 
 Texture3D::Texture3D():
 	Texture(GL_TEXTURE_3D),
+	ifmt(RGB),
 	width(0),
 	height(0),
 	depth(0),
@@ -26,6 +28,7 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
 		throw invalid_operation("Texture3D::storage");
 	if(wd==0 || ht==0 || dp==0)
 		throw invalid_argument("Texture3D::storage");
+	require_pixelformat(fmt);
 
 	width = wd;
 	height = ht;
@@ -51,7 +54,7 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	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;
@@ -69,7 +72,7 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 
 	allocate(level);
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
 }
 
@@ -109,11 +112,14 @@ void Texture3D::load_image(const string &fn, int dp)
 
 	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 incompatible_data("Texture3D::load_image");
 
-	image(0, fmt, UNSIGNED_INT, img.get_data());
+	PixelStore pstore = PixelStore::from_image(img);
+	BindRestore _bind_ps(pstore);
+
+	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
 void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
@@ -130,5 +136,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