X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=7edc908098c73ed0866ff6d9733874f4efa7993d;hb=bdd9a8e26efad3ba349e4ffd58171cfee3cacfb0;hp=183bede5acf5d32389e8942fb9ceeb0c3c55153e;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 183bede5..7edc9080 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -7,6 +7,7 @@ Distributed under the LGPL
 
 #include <cmath>
 #include <msp/gbase/image.h>
+#include "bindable.h"
 #include "except.h"
 #include "extension.h"
 #include "texture3d.h"
@@ -18,20 +19,18 @@ namespace Msp {
 namespace GL {
 
 Texture3D::Texture3D():
+	Texture(GL_TEXTURE_3D),
 	width(0),
 	height(0),
 	depth(0)
 {
-	static RequireVersion _ver(1, 3);
-
-	target = GL_TEXTURE_3D;
-	bind();
+	static RequireVersion _ver(1, 2);
 }
 
 void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d, int b)
 {
 	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");
 
@@ -46,7 +45,10 @@ void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d, int b
 
 void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *data)
 {
-	maybe_bind();
+	if(width==0)
+		throw InvalidState("Texture storage has not been specified");
+
+	Bind _bind(this, true);
 	glTexImage3D(target, level, ifmt, width, height, depth, border, fmt, type, data);
 }