X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.cpp;h=ae4347e334d8d99ee2c07d503a264528c4eb463b;hb=4365124bd39bd6edbda6eaef64ec72a1a10565f8;hp=3fd1ae0955e88c1d432219506fe960db9e4ecdd2;hpb=ada4b7614137221b64a00f31fde1498064e9fb19;p=libs%2Fgl.git

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 3fd1ae09..ae4347e3 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,13 +6,6 @@ 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)
@@ -33,28 +23,7 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
 	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);
-	}
-
-	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>=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)
@@ -85,10 +46,7 @@ void Texture1D::image(const Graphics::Image &img, unsigned lv)
 	if(img.get_height()!=1)
 		throw incompatible_data("Texture1D::image");
 
-	unsigned w = img.get_width();
-	PixelFormat fmt = pixelformat_from_image(img);
-	storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, lv);
-
+	storage(pixelformat_from_image(img, use_srgb_format), img.get_width(), lv);
 	image(0, img.get_pixels());
 }