X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=c5e57df22843d0e0dc84675c24d08bebcaaf1c74;hp=a0ab79b943aef573e192edcc36e1e011fffb77c7;hb=3c46227c280bc4cd8a4487c648f2f080d5b4f7ea;hpb=4a6c595b4d954b6cf69c6388a43b2b66f84d8c0a

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index a0ab79b9..c5e57df2 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -1,3 +1,6 @@
+#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/msp_texture1d.h>
 #include "bindable.h"
 #include "error.h"
@@ -10,7 +13,6 @@ namespace GL {
 
 Texture1D::Texture1D():
 	Texture(GL_TEXTURE_1D),
-	ifmt(RGB),
 	width(0),
 	allocated(0)
 {
@@ -23,19 +25,35 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd)
 		throw invalid_operation("Texture1D::storage");
 	if(wd==0)
 		throw invalid_argument("Texture1D::storage");
-	require_pixelformat(fmt);
 
-	ifmt = fmt;
+	set_internal_format(fmt);
 	width = wd;
 }
 
 void Texture1D::allocate(unsigned level)
 {
+	if(width==0)
+		throw invalid_operation("Texture1D::allocate");
 	if(allocated&(1<<level))
 		return;
 
-	PixelFormat base_fmt = get_base_pixelformat(ifmt);
-	image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	if(ARB_texture_storage)
+	{
+		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+		if(ARB_direct_state_access)
+			glTextureStorage1D(id, n_levels, ifmt, width);
+		else
+		{
+			BindRestore _bind(this);
+			glTexStorage1D(target, n_levels, ifmt, width);
+		}
+		allocated |= (1<<n_levels)-1;
+	}
+	else
+	{
+		PixelFormat base_fmt = get_base_pixelformat(ifmt);
+		image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	}
 }
 
 void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -45,15 +63,17 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 
 	unsigned w = get_level_size(level);
 
+	if(ARB_texture_storage)
+		return sub_image(level, 0, w, fmt, type, data);
+
 	BindRestore _bind(this);
-	glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
+	glTexImage1D(target, level, ifmt, w, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
 		auto_generate_mipmap();
-		for(; w; w>>=1, ++level) ;
-		allocated |= (1<<level)-1;
+		allocated |= (1<<get_n_levels())-1;
 	}
 }
 
@@ -62,10 +82,17 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, D
 	if(width==0)
 		throw invalid_operation("Texture3D::image");
 
+	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
-	BindRestore _bind(this);
-	glTexSubImage1D(target, level, x, wd, fmt, type, data);
+	fmt = get_upload_format(fmt);
+	if(ARB_direct_state_access)
+		glTextureSubImage1D(id, level, x, wd, fmt, type, data);
+	else
+		glTexSubImage1D(target, level, x, wd, fmt, type, data);
+
+	if(gen_mipmap && level==0)
+		auto_generate_mipmap();
 }
 
 void Texture1D::image(const Graphics::Image &img, bool srgb)
@@ -83,7 +110,14 @@ void Texture1D::image(const Graphics::Image &img, bool srgb)
 	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-unsigned Texture1D::get_level_size(unsigned level)
+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;
 }