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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index a2d371e7..6515946b 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -6,9 +6,10 @@ Distributed under the LGPL
 */
 
 #include <cmath>
+#include <msp/gbase/image.h>
+#include "bindable.h"
 #include "except.h"
 #include "extension.h"
-#include "ilwrap.h"
 #include "texture3d.h"
 #include "version_1_2.h"
 
@@ -18,53 +19,82 @@ namespace Msp {
 namespace GL {
 
 Texture3D::Texture3D():
+	Texture(GL_TEXTURE_3D),
 	width(0),
 	height(0),
-	depth(0)
+	depth(0),
+	allocated(0)
 {
-	require_version(1, 3);
-
-	target=GL_TEXTURE_3D;
-	bind();
+	static RequireVersion _ver(1, 2);
 }
 
-void Texture3D::storage(PixelFormat f, sizei w, sizei h, sizei d, int b)
+void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d)
 {
 	if(width>0)
-		throw InvalidState("Textures may only be created once");
+		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;
-	border=b;
+	width = w;
+	height = h;
+	depth = d;
+	ifmt = f;
 
 	image(0, ifmt, UNSIGNED_BYTE, 0);
 }
 
-void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *data)
+void Texture3D::allocate(unsigned level)
+{
+	if(allocated&(1<<level))
+		return;
+
+	image(level, get_base_pixelformat(ifmt), UNSIGNED_BYTE, 0);
+}
+
+void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
+{
+	require_storage();
+
+	unsigned w = width;
+	unsigned h = height;
+	unsigned d = depth;
+	get_level_size(level, w, h, d);
+
+	Bind _bind(this, true);
+	glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+
+	allocated |= 1<<level;
+	if(gen_mipmap && level==0)
+	{
+		for(; (w || h || d); w>>=1, h>>=1, d>>=1, ++level) ;
+		allocated |= (1<<level)-1;
+	}
+}
+
+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)
 {
-	maybe_bind();
-	glTexImage3D(target, level, ifmt, width, height, depth, border, fmt, type, data);
+	require_storage();
+	allocate(level);
+
+	Bind _bind(this, true);
+	glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
 }
 
 void Texture3D::load_image(const string &fn, int dp)
 {
-	Image img;
+	Graphics::Image img;
 	img.load_file(fn);
 
-	unsigned w=img.get_width();
-	unsigned h=img.get_height();
-	unsigned d=1;
+	unsigned w = img.get_width();
+	unsigned h = img.get_height();
+	unsigned d = 1;
 
 	if(dp==-1)
 	{
 		if(h%w)
 			throw IncompatibleData("Image height is not divisible by its width");
-		d=h/w;
-		h=w;
+		d = h/w;
+		h = w;
 	}
 	else if(dp==-2)
 	{
@@ -72,19 +102,39 @@ void Texture3D::load_image(const string &fn, int dp)
 		for(; d*d<h; ++d) ;
 		if(d*d!=h)
 			throw IncompatibleData("Could not find a square root of texture height");
-		h=d;
+		h = d;
 	}
 	else if(dp>0)
-		d=dp;
+		d = dp;
 
-	PixelFormat fmt=img.get_format();
+	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-		storage(fmt, w, h, d, 0);
+		storage(fmt, w, h, d);
 	else if(w!=width || h!=height || d!=depth)
 		throw IncompatibleData("Image does not match texture storage");
 
 	image(0, fmt, UNSIGNED_INT, img.get_data());
 }
 
+void Texture3D::require_storage()
+{
+	if(width==0 || height==0 || depth==0)
+		throw InvalidState("Texture storage has not been specified");
+}
+
+void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
+{
+	w >>= level;
+	h >>= level;
+	d >>= level;
+
+	if(!w && (h || d))
+		w = 1;
+	if(!h && (w || d))
+		h = 1;
+	if(!d && (w || h))
+		d = 1;
+}
+
 } // namespace GL
 } // namespace Msp