X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=5e1f9866e185e6ecdb047f167a26ffa8054d03ea;hp=f64f548ad926ef5901f43a775f8da3e3b6427e25;hb=3c46227c280bc4cd8a4487c648f2f080d5b4f7ea;hpb=08e19bc2b4eba572bc7699378cf55cd8772ac67e

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index f64f548a..5e1f9866 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -3,6 +3,7 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/ext_texture3d.h>
+#include <msp/gl/extensions/ext_texture_array.h>
 #include <msp/graphics/image.h>
 #include "bindable.h"
 #include "error.h"
@@ -16,7 +17,6 @@ namespace GL {
 
 Texture3D::Texture3D(GLenum t):
 	Texture(t),
-	ifmt(RGB),
 	width(0),
 	height(0),
 	depth(0),
@@ -25,7 +25,6 @@ Texture3D::Texture3D(GLenum t):
 
 Texture3D::Texture3D():
 	Texture(GL_TEXTURE_3D),
-	ifmt(RGB),
 	width(0),
 	height(0),
 	depth(0),
@@ -41,11 +40,7 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
 	if(wd==0 || ht==0 || dp==0)
 		throw invalid_argument("Texture3D::storage");
 
-	if(MSP_sized_internal_formats)
-		fmt = get_sized_pixelformat(fmt);
-	require_pixelformat(fmt);
-
-	ifmt = fmt;
+	set_internal_format(fmt);
 	width = wd;
 	height = ht;
 	depth = dp;
@@ -53,6 +48,8 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
 
 void Texture3D::allocate(unsigned level)
 {
+	if(width==0 || height==0 || depth==0)
+		throw invalid_operation("Texture3D::allocate");
 	if(allocated&(1<<level))
 		return;
 
@@ -89,7 +86,7 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 		return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
 
 	BindRestore _bind(this);
-	glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+	glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
@@ -107,6 +104,7 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
+	fmt = get_upload_format(fmt);
 	if(ARB_direct_state_access)
 		glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, fmt, type, data);
 	else