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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index f6268d69..03a64f1c 100644
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -1,13 +1,10 @@
 #include <cmath>
-#include <msp/core/raii.h>
 #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"
-#include "pixelstore.h"
 #include "texture3d.h"
 
 using namespace std;
@@ -19,16 +16,14 @@ Texture3D::Texture3D(GLenum t):
 	Texture(t),
 	width(0),
 	height(0),
-	depth(0),
-	allocated(0)
+	depth(0)
 { }
 
 Texture3D::Texture3D():
 	Texture(GL_TEXTURE_3D),
 	width(0),
 	height(0),
-	depth(0),
-	allocated(0)
+	depth(0)
 {
 	static Require _req(EXT_texture3D);
 }
@@ -51,68 +46,38 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp,
 	levels = get_n_levels();
 	if(lv>0)
 		levels = min(levels, lv);
-}
-
-void Texture3D::allocate(unsigned level)
-{
-	if(width==0 || height==0 || depth==0)
-		throw invalid_operation("Texture3D::allocate");
-	if(level>=levels)
-		throw invalid_argument("Texture3D::allocate");
-	if(allocated&(1<<level))
-		return;
 
+	GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
 	if(ARB_texture_storage)
 	{
-		Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 		if(ARB_direct_state_access)
-			glTextureStorage3D(id, levels, storage_fmt, width, height, depth);
+			glTextureStorage3D(id, levels, gl_fmt, width, height, depth);
 		else
-			glTexStorage3D(target, levels, storage_fmt, width, height, depth);
-		apply_swizzle();
-		allocated |= (1<<levels)-1;
+		{
+			bind_scratch();
+			glTexStorage3D(target, levels, gl_fmt, width, height, depth);
+		}
 	}
 	else
-		image(level, 0);
-}
-
-void Texture3D::image(unsigned level, const void *data)
-{
-	if(width==0 || height==0 || depth==0)
-		throw invalid_operation("Texture3D::image");
-	if(level>=levels)
-		throw out_of_range("Texture3D::image");
-
-	LinAl::Vector<unsigned, 3> size = get_level_size(level);
-
-	if(ARB_texture_storage)
-		return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
-
-	BindRestore _bind(this);
-
-	if(!allocated)
 	{
+		bind_scratch();
+		GLenum comp = get_gl_components(get_components(storage_fmt));
+		GLenum type = get_gl_type(get_component_type(storage_fmt));
+		for(unsigned i=0; i<levels; ++i)
+		{
+			LinAl::Vector<unsigned, 3> lv_size = get_level_size(i);
+			glTexImage3D(target, i, gl_fmt, lv_size.x, lv_size.y, lv_size.z, 0, comp, type, 0);
+		}
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-		apply_swizzle();
 	}
 
-	PixelComponents comp = 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);
-
-	allocated |= 1<<level;
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap();
-		allocated |= (1<<levels)-1;
-	}
+	apply_swizzle();
 }
 
-void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+void Texture3D::image(unsigned level, const void *data)
 {
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("Texture3D::image");
-	image(level, data);
+	LinAl::Vector<unsigned, 3> size = get_level_size(level);
+	return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
 }
 
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
@@ -122,25 +87,15 @@ 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();
-}
-
-void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data)
-{
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("Texture3D::sub_image");
-	sub_image(level, x, y, z, wd, ht, dp, data);
+	}
 }
 
 void Texture3D::image(const Graphics::Image &img, unsigned lv)
@@ -156,9 +111,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());
 }
 
@@ -190,7 +142,7 @@ LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
 	return LinAl::Vector<unsigned, 3>(w, h, d);
 }
 
-UInt64 Texture3D::get_data_size() const
+uint64_t Texture3D::get_data_size() const
 {
 	return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
 }