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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 03a64f1c..e48b7662 100644
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -1,9 +1,4 @@
 #include <cmath>
-#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"
 
@@ -12,22 +7,10 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture3D::Texture3D(GLenum t):
-	Texture(t),
-	width(0),
-	height(0),
-	depth(0)
+Texture3D::Texture3D(unsigned t):
+	Texture3DBackend(t)
 { }
 
-Texture3D::Texture3D():
-	Texture(GL_TEXTURE_3D),
-	width(0),
-	height(0),
-	depth(0)
-{
-	static Require _req(EXT_texture3D);
-}
-
 void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv)
 {
 	if(width>0)
@@ -47,31 +30,7 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp,
 	if(lv>0)
 		levels = min(levels, lv);
 
-	GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
-	if(ARB_texture_storage)
-	{
-		if(ARB_direct_state_access)
-			glTextureStorage3D(id, levels, gl_fmt, width, height, depth);
-		else
-		{
-			bind_scratch();
-			glTexStorage3D(target, levels, gl_fmt, width, height, depth);
-		}
-	}
-	else
-	{
-		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();
+	allocate();
 }
 
 void Texture3D::image(unsigned level, const void *data)
@@ -87,15 +46,7 @@ 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");
 
-	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);
-	}
+	Texture3DBackend::sub_image(level, x, y, z, wd, ht, dp, data);
 }
 
 void Texture3D::image(const Graphics::Image &img, unsigned lv)
@@ -108,16 +59,14 @@ 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)
+	if(!is_array())
 		s = max(s, depth);
 	unsigned n = 0;
 	for(; s; s>>=1, ++n) ;
@@ -129,7 +78,7 @@ 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))