X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=b50f8cf444c0c9fb1435ce97e756ffc1330b59c2;hb=73eec11d44a24bac121f1b0d85f20d58005f3545;hp=ed7d8f6e2b877fd4f660d71dbdc72874ef3de34b;hpb=194f960f91041ebee44e2745627d5e480e893d82;p=libs%2Fgl.git

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index ed7d8f6e..b50f8cf4 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"
@@ -11,39 +13,44 @@ namespace GL {
 
 Texture1D::Texture1D():
 	Texture(GL_TEXTURE_1D),
-	ifmt(RGB),
 	width(0),
 	allocated(0)
 {
 	static Require _req(MSP_texture1D);
 }
 
-void Texture1D::storage(PixelFormat fmt, unsigned wd)
+void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
 {
 	if(width>0)
 		throw invalid_operation("Texture1D::storage");
 	if(wd==0)
 		throw invalid_argument("Texture1D::storage");
 
-	if(MSP_sized_internal_formats)
-		fmt = get_sized_pixelformat(fmt);
-	require_pixelformat(fmt);
-
-	ifmt = fmt;
+	set_internal_format(fmt);
 	width = wd;
+	levels = get_n_levels();
+	if(lv)
+		levels = min(levels, lv);
 }
 
 void Texture1D::allocate(unsigned level)
 {
+	if(width==0)
+		throw invalid_operation("Texture1D::allocate");
+	if(level>=levels)
+		throw invalid_argument("Texture1D::allocate");
 	if(allocated&(1<<level))
 		return;
 
 	if(ARB_texture_storage)
 	{
-		BindRestore _bind(this);
-		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
-		glTexStorage1D(target, n_levels, ifmt, width);
-		allocated |= (1<<n_levels)-1;
+		Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
+		if(ARB_direct_state_access)
+			glTextureStorage1D(id, levels, ifmt, width);
+		else
+			glTexStorage1D(target, levels, ifmt, width);
+		apply_swizzle();
+		allocated |= (1<<levels)-1;
 	}
 	else
 	{
@@ -63,13 +70,19 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 		return sub_image(level, 0, w, fmt, type, data);
 
 	BindRestore _bind(this);
-	glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
+
+	if(!allocated)
+	{
+		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+		apply_swizzle();
+	}
+	glTexImage1D(target, level, ifmt, w, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap && level==0)
 	{
-		auto_generate_mipmap();
-		allocated |= (1<<get_n_levels())-1;
+		generate_mipmap();
+		allocated |= (1<<levels)-1;
 	}
 }
 
@@ -78,16 +91,20 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, D
 	if(width==0)
 		throw invalid_operation("Texture3D::image");
 
-	BindRestore _bind(this);
+	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
-	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();
+	if(auto_gen_mipmap && level==0)
+		generate_mipmap();
 }
 
-void Texture1D::image(const Graphics::Image &img, bool srgb)
+void Texture1D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
 	if(img.get_height()!=1)
 		throw incompatible_data("Texture1D::image");
@@ -95,7 +112,7 @@ void Texture1D::image(const Graphics::Image &img, bool srgb)
 	unsigned w = img.get_width();
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, lv);
 	else if(w!=width)
 		throw incompatible_data("Texture1D::image");
 
@@ -136,6 +153,7 @@ void Texture1D::Loader::init()
 {
 	add("raw_data", &Loader::raw_data);
 	add("storage", &Loader::storage);
+	add("storage", &Loader::storage_levels);
 }
 
 void Texture1D::Loader::raw_data(const string &data)
@@ -145,10 +163,13 @@ void Texture1D::Loader::raw_data(const string &data)
 
 void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
 {
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, w);
 }
 
+void Texture1D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned l)
+{
+	obj.storage(fmt, w, l);
+}
+
 } // namespace GL
 } // namespace Msp