X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture3d.cpp;h=bdb87882e878333c23e88373bc85b57d277c7e74;hb=a3cc9f4469153396c7ad0868f3cbb2d2f698d710;hp=3c675dbb705847527586b452f414bdc4b49c1fb1;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;p=libs%2Fgl.git

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 3c675dbb..bdb87882 100644
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -5,9 +5,7 @@
 #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"
-#include "pixelstore.h"
 #include "texture3d.h"
 
 using namespace std;
@@ -59,8 +57,6 @@ void Texture3D::allocate(unsigned level)
 		throw invalid_operation("Texture3D::allocate");
 	if(level>=levels)
 		throw invalid_argument("Texture3D::allocate");
-	if(allocated&(1<<level))
-		return;
 
 	bool direct = ARB_texture_storage && ARB_direct_state_access;
 	if(!direct)
@@ -77,12 +73,16 @@ void Texture3D::allocate(unsigned level)
 
 void Texture3D::allocate_(unsigned level)
 {
+	if(allocated&(1<<level))
+		return;
+
 	if(ARB_texture_storage)
 	{
+		GLenum fmt = get_gl_pixelformat(storage_fmt);
 		if(ARB_direct_state_access)
-			glTextureStorage3D(id, levels, storage_fmt, width, height, depth);
+			glTextureStorage3D(id, levels, fmt, width, height, depth);
 		else
-			glTexStorage3D(target, levels, storage_fmt, width, height, depth);
+			glTexStorage3D(target, levels, fmt, width, height, depth);
 		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
@@ -126,9 +126,10 @@ void Texture3D::image_(unsigned level, const void *data)
 	}
 
 	LinAl::Vector<unsigned, 3> size = get_level_size(level);
-	PixelComponents comp = get_components(storage_fmt);
+	GLenum fmt = get_gl_pixelformat(storage_fmt);
+	GLenum comp = get_gl_components(get_components(storage_fmt));
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
-	glTexImage3D(target, level, storage_fmt, size.x, size.y, size.z, 0, comp, type, data);
+	glTexImage3D(target, level, fmt, size.x, size.y, size.z, 0, comp, type, data);
 
 	allocated |= 1<<level;
 }
@@ -156,7 +157,7 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 
 	allocate_(level);
 
-	PixelComponents comp = get_components(storage_fmt);
+	GLenum comp = get_gl_components(get_components(storage_fmt));
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
 	if(ARB_direct_state_access)
 		glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, comp, type, data);
@@ -190,9 +191,6 @@ void Texture3D::image(const Graphics::Image &img, unsigned lv)
 	PixelFormat fmt = pixelformat_from_image(img);
 	storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, d, lv);
 
-	PixelStore pstore = PixelStore::from_image(img);
-	BindRestore _bind_ps(pstore);
-
 	image(0, img.get_pixels());
 }