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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index bdb87882..0ee2e800 100644
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -1,10 +1,4 @@
 #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 "error.h"
 #include "texture3d.h"
 
@@ -13,29 +7,15 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture3D::Texture3D(GLenum t):
-	Texture(t),
-	width(0),
-	height(0),
-	depth(0),
-	allocated(0)
+Texture3D::Texture3D(unsigned t):
+	Texture3DBackend(t)
 { }
 
-Texture3D::Texture3D():
-	Texture(GL_TEXTURE_3D),
-	width(0),
-	height(0),
-	depth(0),
-	allocated(0)
-{
-	static Require _req(EXT_texture3D);
-}
-
 void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv)
 {
 	if(width>0)
 	{
-		if(fmt!=format || wd!=width || ht!=height || dp!=depth || (lv && lv!=levels))
+		if(fmt!=format || wd!=width || ht!=height || dp!=depth || (lv && lv!=n_levels))
 			throw incompatible_data("Texture3D::storage");
 		return;
 	}
@@ -46,136 +26,30 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp,
 	width = wd;
 	height = ht;
 	depth = dp;
-	levels = get_n_levels();
+	unsigned size = max(width, height);
+	if(!is_array())
+		size = max(size, depth);
+	n_levels = count_levels(size);
 	if(lv>0)
-		levels = min(levels, lv);
-}
+		n_levels = min(n_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");
-
-	bool direct = ARB_texture_storage && ARB_direct_state_access;
-	if(!direct)
-	{
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(target, id);
-	}
-
-	allocate_(level);
-
-	if(!direct)
-		glBindTexture(target, 0);
-}
-
-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, fmt, width, height, depth);
-		else
-			glTexStorage3D(target, levels, fmt, width, height, depth);
-		apply_swizzle();
-		allocated |= (1<<levels)-1;
-	}
-	else
-		image_(level, 0);
+	allocate();
 }
 
 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");
-
-	if(ARB_texture_storage)
-	{
-		LinAl::Vector<unsigned, 3> size = get_level_size(level);
-		return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
-	}
-
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(target, id);
-
-	image_(level, data);
-
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap_();
-		allocated |= (1<<levels)-1;
-	}
-
-	glBindTexture(target, 0);
-}
-
-void Texture3D::image_(unsigned level, const void *data)
-{
-	if(!allocated)
-	{
-		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-		apply_swizzle();
-	}
-
 	LinAl::Vector<unsigned, 3> size = get_level_size(level);
-	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, fmt, size.x, size.y, size.z, 0, comp, type, data);
-
-	allocated |= 1<<level;
-}
-
-void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
-{
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("Texture3D::image");
-	image(level, data);
+	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)
+void Texture3D::sub_image(unsigned level, unsigned x, unsigned y, unsigned z, unsigned wd, unsigned ht, unsigned dp, const void *data)
 {
 	if(width==0 || height==0 || depth==0)
 		throw invalid_operation("Texture3D::sub_image");
-	if(level>=levels)
+	if(level>=n_levels || x>width || x+wd>width || y>height || y+ht>height || z>depth || z+dp>depth)
 		throw out_of_range("Texture3D::sub_image");
 
-	bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
-	if(!direct)
-	{
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(target, id);
-	}
-
-	allocate_(level);
-
-	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
-		glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
-
-	if(auto_gen_mipmap && level==0)
-		generate_mipmap_();
-
-	if(!direct)
-		glBindTexture(target, 0);
-}
-
-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);
+	Texture3DBackend::sub_image(level, x, y, z, wd, ht, dp, data);
 }
 
 void Texture3D::image(const Graphics::Image &img, unsigned lv)
@@ -188,28 +62,16 @@ void Texture3D::image(const Graphics::Image &img, unsigned lv)
 	unsigned d = h/w;
 	h = w;
 
-	PixelFormat fmt = pixelformat_from_image(img);
-	storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, d, lv);
-
+	storage(pixelformat_from_image(img, use_srgb_format), w, h, d, lv);
 	image(0, img.get_pixels());
 }
 
-unsigned Texture3D::get_n_levels() const
-{
-	unsigned s = max(width, height);
-	if(target!=GL_TEXTURE_2D_ARRAY)
-		s = max(s, depth);
-	unsigned n = 0;
-	for(; s; s>>=1, ++n) ;
-	return n;
-}
-
 LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
 {
 	unsigned w = width>>level;
 	unsigned h = height>>level;
 	unsigned d = depth;
-	if(target!=GL_TEXTURE_2D_ARRAY)
+	if(!is_array())
 		d >>= level;
 
 	if(!w && (h || d))
@@ -222,11 +84,6 @@ 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
-{
-	return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
-}
-
 
 Texture3D::Loader::Loader(Texture3D &t):
 	DataFile::DerivedObjectLoader<Texture3D, Texture::Loader>(t)
@@ -242,16 +99,10 @@ Texture3D::Loader::Loader(Texture3D &t, Collection &c):
 
 void Texture3D::Loader::init()
 {
-	add("raw_data", &Loader::raw_data);
 	add("storage", &Loader::storage);
 	add("storage", &Loader::storage_levels);
 }
 
-void Texture3D::Loader::raw_data(const string &data)
-{
-	obj.image(0, data.data());
-}
-
 void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned d)
 {
 	obj.storage(fmt, w, h, d);