X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=806e4a179bded9f8a71264ecce78bccafc529870;hp=d435a356a9ef3f215c6f11d912e1c76fade17959;hb=aea9ceca71b59358248be94fdf272fd4791ca990;hpb=e079d5a878e83dc0baffcec66a57659c885cd593

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index d435a356..806e4a17 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,4 +1,6 @@
-#include <msp/io/memory.h>
+#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"
@@ -34,7 +36,6 @@ public:
 
 Texture2D::Texture2D(ResourceManager *m):
 	Texture(GL_TEXTURE_2D, m),
-	ifmt(RGB),
 	width(0),
 	height(0),
 	allocated(0)
@@ -45,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)
@@ -76,15 +97,17 @@ 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);
+	glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
 		auto_generate_mipmap();
-		for(; (w || h); w>>=1, h>>=1, ++level) ;
-		allocated |= (1<<level)-1;
+		allocated |= (1<<get_n_levels())-1;
 	}
 }
 
@@ -93,18 +116,17 @@ 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);
-}
-
-void Texture2D::load_image(const string &fn, bool srgb)
-{
-	Graphics::Image img;
-	img.load_file(fn);
+	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);
 
-	image(img, srgb);
+	if(gen_mipmap && level==0)
+		auto_generate_mipmap();
 }
 
 void Texture2D::image(const Graphics::Image &img, bool srgb)
@@ -118,7 +140,10 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
 	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);
+	{
+		unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, l);
+	}
 	else if(w!=width || h!=height)
 		throw incompatible_data("Texture2D::image");
 
@@ -128,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;
@@ -149,7 +181,7 @@ 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()
@@ -175,19 +207,8 @@ Texture2D::Loader::Loader(Texture2D &t, Collection &c):
 
 void Texture2D::Loader::init()
 {
-	add("image_data", &Loader::image_data);
 	add("raw_data", &Loader::raw_data);
 	add("storage", &Loader::storage);
-	add("storage", &Loader::storage_b);
-}
-
-void Texture2D::Loader::image_data(const string &data)
-{
-	Graphics::Image img;
-	IO::Memory mem(data.data(), data.size());
-	img.load_io(mem);
-
-	obj.image(img, srgb);
 }
 
 void Texture2D::Loader::raw_data(const string &data)
@@ -197,16 +218,9 @@ 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);
 }
 
-void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
-{
-	storage(fmt, w, h);
-}
-
 
 Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
 	texture(t),