X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=24266150672a90fab1f1a5acd4fd8cb4d16f849a;hb=9087cc0;hp=0dc85586cbc2e76c328077ca9b666b96c16873e9;hpb=e01371d38e290b4c526146fd5d1388bba8201233;p=libs%2Fgl.git

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index 0dc85586..24266150 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.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 <msp/gl/extensions/msp_texture1d.h>
 #include "bindable.h"
 #include "error.h"
@@ -10,79 +13,109 @@ 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;
 
-	PixelFormat base_fmt = get_base_pixelformat(ifmt);
-	image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	if(ARB_texture_storage)
+	{
+		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
+		image(level, get_components(ifmt), get_component_type(ifmt), 0);
 }
 
-void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
+void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
 {
 	if(width==0)
 		throw invalid_operation("Texture1D::image");
 
 	unsigned w = get_level_size(level);
 
+	if(ARB_texture_storage)
+		return sub_image(level, 0, w, comp, 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_components(comp), 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;
 	}
 }
 
-void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, DataType type, const void *data)
+void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelComponents comp, DataType type, const void *data)
 {
 	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);
+	comp = get_upload_components(comp);
+	if(ARB_direct_state_access)
+		glTextureSubImage1D(id, level, x, wd, comp, type, data);
+	else
+		glTexSubImage1D(target, level, x, wd, comp, type, data);
+
+	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");
 
 	unsigned w = img.get_width();
-	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	PixelFormat fmt = pixelformat_from_image(img);
+	PixelComponents comp = get_components(fmt);
+	DataType type = get_component_type(fmt);
 	if(width==0)
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+		storage(make_pixelformat(comp, type, srgb), w, lv);
 	else if(w!=width)
 		throw incompatible_data("Texture1D::image");
 
-	image(0, fmt, UNSIGNED_BYTE, img.get_data());
+	image(0, comp, type, img.get_data());
 }
 
 unsigned Texture1D::get_n_levels() const
@@ -119,19 +152,23 @@ 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)
 {
-	obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+	obj.image(0, get_components(obj.ifmt), get_component_type(obj.ifmt), data.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