X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=abdfe0d1569ca50d7f06e15531e5e01997cb47bc;hb=47f817343df1d06d91a4f7c4d5b47df40b24366c;hp=ae1afbc60cca9f0e64f05c743af38b0b64241e13;hpb=3a9ee749fbde41695d1b1a0804bbf63d76427b27;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index ae1afbc6..abdfe0d1 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)
@@ -44,26 +46,46 @@ Texture2D::~Texture2D()
 	set_manager(0);
 }
 
-void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
+void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
 {
 	if(width>0)
 		throw invalid_operation("Texture2D::storage");
 	if(wd==0 || ht==0)
 		throw invalid_argument("Texture2D::storage");
-	require_pixelformat(fmt);
 
-	ifmt = fmt;
+	set_internal_format(fmt);
 	width = wd;
 	height = ht;
+	levels = get_n_levels();
+	if(lv>0)
+		levels = min(levels, lv);
 }
 
 void Texture2D::allocate(unsigned level)
 {
+	if(width==0 || height==0)
+		throw invalid_operation("Texture2D::allocate");
+	if(level>=levels)
+		throw invalid_argument("Texture2D::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)
+	{
+		if(ARB_direct_state_access)
+			glTextureStorage2D(id, levels, ifmt, width, height);
+		else
+		{
+			BindRestore _bind(this);
+			glTexStorage2D(target, levels, ifmt, width, height);
+		}
+		allocated |= (1<<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)
@@ -75,15 +97,20 @@ 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);
+
+	if(!allocated)
+		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+	glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap && level==0)
 	{
-		auto_generate_mipmap();
-		for(; (w || h); w>>=1, h>>=1, ++level) ;
-		allocated |= (1<<level)-1;
+		generate_mipmap();
+		allocated |= (1<<levels)-1;
 	}
 }
 
@@ -92,25 +119,32 @@ 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);
+	fmt = get_upload_format(fmt);
+	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(auto_gen_mipmap && level==0)
+		generate_mipmap();
 }
 
-void Texture2D::image(const Graphics::Image &img, bool srgb)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
-	image(img, srgb, false);
+	image(img, lv, srgb, false);
 }
 
-void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb, bool from_buffer)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h);
-	else if(w!=width || h!=height)
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, lv);
+	else if(w!=width || h!=height || (lv && lv!=levels))
 		throw incompatible_data("Texture2D::image");
 
 	PixelStore pstore = PixelStore::from_image(img);
@@ -119,7 +153,14 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
 	image(0, fmt, UNSIGNED_BYTE, from_buffer ? 0 : img.get_data());
 }
 
-void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
+unsigned Texture2D::get_n_levels() const
+{
+	unsigned n = 0;
+	for(unsigned s=max(width, height); s; s>>=1, ++n) ;
+	return n;
+}
+
+void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const
 {
 	w >>= level;
 	h >>= level;
@@ -140,13 +181,14 @@ Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *res)
 
 UInt64 Texture2D::get_data_size() const
 {
-	return id ? width*height*get_component_count(ifmt) : 0;
+	return id ? width*height*get_pixel_size(ifmt) : 0;
 }
 
 void Texture2D::unload()
 {
 	glDeleteTextures(1, &id);
 	id = 0;
+	allocated = 0;
 	// TODO check which params actually need refreshing
 	dirty_params = -1;
 }
@@ -177,8 +219,6 @@ void Texture2D::Loader::raw_data(const string &data)
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 {
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, w, h);
 }
 
@@ -213,8 +253,8 @@ bool Texture2D::AsyncLoader::process()
 	}
 	else if(phase==1)
 	{
-		pixel_buffer.data(n_bytes, 0);
-		mapped_address = reinterpret_cast<char *>(pixel_buffer.map(WRITE_ONLY));
+		pixel_buffer.storage(n_bytes);
+		mapped_address = reinterpret_cast<char *>(pixel_buffer.map());
 	}
 	else if(phase==2)
 	{
@@ -231,8 +271,13 @@ bool Texture2D::AsyncLoader::process()
 		}
 
 		if(!texture.id)
-			glGenTextures(1, &texture.id);
-		texture.image(image, srgb_conversion, true);
+		{
+			if(ARB_direct_state_access)
+				glCreateTextures(texture.target, 1, &texture.id);
+			else
+				glGenTextures(1, &texture.id);
+		}
+		texture.image(image, 0, srgb_conversion, true);
 	}
 
 	++phase;