X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture3d.cpp;h=705a40ba5574cc950078d119e9061a90e6bd9272;hb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784;hp=f6268d697d6d60c00735c6230e6ff6c701eb8b7c;hpb=2b7f8e45e75bec30c1ea27fc0efd8286f67adc3f;p=libs%2Fgl.git

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index f6268d69..705a40ba 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;
@@ -64,11 +62,14 @@ void Texture3D::allocate(unsigned level)
 
 	if(ARB_texture_storage)
 	{
-		Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
+		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);
+		{
+			bind_scratch();
+			glTexStorage3D(target, levels, fmt, width, height, depth);
+		}
 		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
@@ -88,7 +89,7 @@ void Texture3D::image(unsigned level, const void *data)
 	if(ARB_texture_storage)
 		return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
 
-	BindRestore _bind(this);
+	bind_scratch();
 
 	if(!allocated)
 	{
@@ -96,9 +97,10 @@ void Texture3D::image(unsigned level, const void *data)
 		apply_swizzle();
 	}
 
-	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;
 	if(auto_gen_mipmap && level==0)
@@ -122,15 +124,17 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 	if(level>=levels)
 		throw out_of_range("Texture3D::sub_image");
 
-	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	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);
 	else
+	{
+		bind_scratch();
 		glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
+	}
 
 	if(auto_gen_mipmap && level==0)
 		generate_mipmap();
@@ -156,9 +160,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());
 }