X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=32053e83fa9bd8ad9231720c79defa3474229415;hb=b1c758a602262afad23e28ab68d62021a5b1257e;hp=44e49f51142fde02d41fa4da16b5119cb129d840;hpb=cb836adcf11f690188df9b7bc59f3fe87b67aaa7;p=libs%2Fgl.git

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index 44e49f51..32053e83 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -1,3 +1,5 @@
+#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"
@@ -40,9 +42,14 @@ void Texture1D::allocate(unsigned level)
 
 	if(ARB_texture_storage)
 	{
-		BindRestore _bind(this);
 		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
-		glTexStorage1D(target, n_levels, ifmt, width);
+		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
@@ -59,11 +66,11 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 
 	unsigned w = get_level_size(level);
 
-	BindRestore _bind(this);
 	if(ARB_texture_storage)
-		sub_image(level, 0, w, fmt, type, data);
-	else
-		glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
+		return sub_image(level, 0, w, fmt, type, data);
+
+	BindRestore _bind(this);
+	glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
@@ -78,10 +85,16 @@ 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);
+	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)