X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.cpp;h=ce5d3727fad5f260d274a4694561b77e40abf07b;hb=560b11de262a6cae2c71d744598bf3fd435ab14f;hp=76ff946fc45959f58af87dfa93851c5c2f0a3327;hpb=8b3e51aeff0e22d29a34772c77b8647108f58677;p=libs%2Fgl.git

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 76ff946f..ce5d3727 100644
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -1,6 +1,3 @@
-#include <msp/gl/extensions/arb_direct_state_access.h>
-#include <msp/gl/extensions/arb_texture_storage.h>
-#include <msp/gl/extensions/msp_texture1d.h>
 #include "error.h"
 #include "texture1d.h"
 
@@ -9,18 +6,11 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture1D::Texture1D():
-	Texture(GL_TEXTURE_1D),
-	width(0)
-{
-	static Require _req(MSP_texture1D);
-}
-
 void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
 {
 	if(width>0)
 	{
-		if(fmt!=format || wd!=width || (lv && lv!=levels))
+		if(fmt!=format || wd!=width || (lv && lv!=n_levels))
 			throw incompatible_data("Texture1D::storage");
 		return;
 	}
@@ -29,32 +19,11 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
 
 	set_format(fmt);
 	width = wd;
-	levels = get_n_levels();
+	n_levels = count_levels(width);
 	if(lv)
-		levels = min(levels, lv);
-
-	GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
-	if(ARB_texture_storage)
-	{
-		if(ARB_direct_state_access)
-			glTextureStorage1D(id, levels, gl_fmt, width);
-		else
-		{
-			bind_scratch();
-			glTexStorage1D(target, levels, gl_fmt, width);
-		}
-	}
-	else
-	{
-		bind_scratch();
-		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-		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)
-			glTexImage1D(target, i, gl_fmt, get_level_size(i), 0, comp, type, 0);
-	}
+		n_levels = min(n_levels, lv);
 
-	apply_swizzle();
+	allocate();
 }
 
 void Texture1D::image(unsigned level, const void *data)
@@ -62,22 +31,14 @@ void Texture1D::image(unsigned level, const void *data)
 	return sub_image(level, 0, get_level_size(level), data);
 }
 
-void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
+void Texture1D::sub_image(unsigned level, unsigned x, unsigned wd, const void *data)
 {
 	if(width==0)
 		throw invalid_operation("Texture1D::sub_image");
-	if(level>=levels)
+	if(level>=n_levels || x>width || x+wd>width)
 		throw out_of_range("Texture1D::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)
-		glTextureSubImage1D(id, level, x, wd, comp, type, data);
-	else
-	{
-		bind_scratch();
-		glTexSubImage1D(target, level, x, wd, comp, type, data);
-	}
+	Texture1DBackend::sub_image(level, x, wd, data);
 }
 
 void Texture1D::image(const Graphics::Image &img, unsigned lv)
@@ -89,23 +50,11 @@ void Texture1D::image(const Graphics::Image &img, unsigned lv)
 	image(0, img.get_pixels());
 }
 
-unsigned Texture1D::get_n_levels() const
-{
-	unsigned n = 0;
-	for(unsigned s=width; s; s>>=1, ++n) ;
-	return n;
-}
-
 unsigned Texture1D::get_level_size(unsigned level) const
 {
 	return width>>level;
 }
 
-uint64_t Texture1D::get_data_size() const
-{
-	return id ? width*get_pixel_size(storage_fmt) : 0;
-}
-
 
 Texture1D::Loader::Loader(Texture1D &t):
 	DataFile::DerivedObjectLoader<Texture1D, Texture::Loader>(t)
@@ -121,16 +70,10 @@ Texture1D::Loader::Loader(Texture1D &t, Collection &c):
 
 void Texture1D::Loader::init()
 {
-	add("raw_data", &Loader::raw_data);
 	add("storage", &Loader::storage);
 	add("storage", &Loader::storage_levels);
 }
 
-void Texture1D::Loader::raw_data(const string &data)
-{
-	obj.image(0, data.data());
-}
-
 void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
 {
 	obj.storage(fmt, w);