X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=3d322d4b9bd9c14834097c81773c085e9bda7584;hb=8aea0f65f9ab7d603e47cf4479388af246cc8400;hp=4aac49edfaf82f27eaf4c3eef8c7021596d5033e;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 4aac49ed..3d322d4b 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,10 +1,10 @@
 #include <cmath>
+#include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/graphics/image.h>
 #include "bindable.h"
 #include "error.h"
-#include "extension.h"
+#include "pixelstore.h"
 #include "texture3d.h"
-#include "version_1_2.h"
 
 using namespace std;
 
@@ -18,20 +18,21 @@ Texture3D::Texture3D():
 	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 invalid_operation("Texture3D::storage");
-	if(w==0 || h==0 || d==0)
+	if(wd==0 || ht==0 || dp==0)
 		throw invalid_argument("Texture3D::storage");
+	require_pixelformat(fmt);
 
-	width = w;
-	height = h;
-	depth = d;
-	ifmt = f;
+	width = wd;
+	height = ht;
+	depth = dp;
+	ifmt = fmt;
 }
 
 void Texture3D::allocate(unsigned level)
@@ -99,15 +100,25 @@ void Texture3D::load_image(const string &fn, int dp)
 		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 incompatible_data("Texture3D::load_image");
 
-	image(0, fmt, UNSIGNED_INT, img.get_data());
+	PixelStore pstore = PixelStore::from_image(img);
+	Bind _bind_ps(pstore, true);
+
+	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
 void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)