X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=75b84ec7bbe5747c17ee47b137ba56df33e9101e;hb=cdf928f03f4d8383b8fa978abc4c255a850ec061;hp=95f9f790507292797573931f9c241b6ae877be6e;hpb=e01371d38e290b4c526146fd5d1388bba8201233;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 95f9f790..75b84ec7 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.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 "bindable.h"
 #include "buffer.h"
 #include "error.h"
@@ -33,7 +36,6 @@ public:
 
 Texture2D::Texture2D(ResourceManager *m):
 	Texture(GL_TEXTURE_2D, m),
-	ifmt(RGB),
 	width(0),
 	height(0),
 	allocated(0)
@@ -51,11 +53,7 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 	if(wd==0 || ht==0)
 		throw invalid_argument("Texture2D::storage");
 
-	if(MSP_sized_internal_formats)
-		fmt = get_sized_pixelformat(fmt);
-	require_pixelformat(fmt);
-
-	ifmt = fmt;
+	set_internal_format(fmt);
 	width = wd;
 	height = ht;
 }
@@ -65,8 +63,23 @@ void Texture2D::allocate(unsigned level)
 	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)
+			glTextureStorage2D(id, n_levels, ifmt, width, height);
+		else
+		{
+			BindRestore _bind(this);
+			glTexStorage2D(target, n_levels, ifmt, width, height);
+		}
+		allocated |= (1<<n_levels)-1;
+	}
+	else
+	{
+		PixelFormat base_fmt = get_base_pixelformat(ifmt);
+		image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	}
 }
 
 void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -78,6 +91,9 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned h = height;
 	get_level_size(level, w, h);
 
+	if(ARB_texture_storage)
+		return sub_image(level, 0, 0, w, h, fmt, type, data);
+
 	BindRestore _bind(this);
 	glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
 
@@ -94,10 +110,16 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	if(width==0 || height==0)
 		throw invalid_operation("Texture2D::sub_image");
 
+	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
-	BindRestore _bind(this);
-	glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+	if(ARB_direct_state_access)
+		glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
+	else
+		glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+
+	if(gen_mipmap && level==0)
+		auto_generate_mipmap();
 }
 
 void Texture2D::image(const Graphics::Image &img, bool srgb)