X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.cpp;h=3fd1ae0955e88c1d432219506fe960db9e4ecdd2;hb=ada4b7614137221b64a00f31fde1498064e9fb19;hp=4c58d4701639d777b0471b846acc7717d480c90b;hpb=715672cf2c64dab0744db676fdee255ee3a4cef7;p=libs%2Fgl.git

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 4c58d470..3fd1ae09 100644
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -1,4 +1,3 @@
-#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>
@@ -12,8 +11,7 @@ namespace GL {
 
 Texture1D::Texture1D():
 	Texture(GL_TEXTURE_1D),
-	width(0),
-	allocated(0)
+	width(0)
 {
 	static Require _req(MSP_texture1D);
 }
@@ -34,90 +32,34 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
 	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");
-
-	bool direct = ARB_texture_storage && ARB_direct_state_access;
-	if(!direct)
-	{
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(target, id);
-	}
-
-	allocate_(level);
-
-	if(!direct)
-		glBindTexture(target, 0);
-}
-
-void Texture1D::allocate_(unsigned level)
-{
-	if(allocated&(1<<level))
-		return;
 
+	GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
 	if(ARB_texture_storage)
 	{
 		if(ARB_direct_state_access)
-			glTextureStorage1D(id, levels, storage_fmt, width);
+			glTextureStorage1D(id, levels, gl_fmt, width);
 		else
-			glTexStorage1D(target, levels, storage_fmt, width);
-		apply_swizzle();
-		allocated |= (1<<levels)-1;
+		{
+			bind_scratch();
+			glTexStorage1D(target, levels, gl_fmt, width);
+		}
 	}
 	else
-		image_(level, 0);
-}
-
-void Texture1D::image(unsigned level, const void *data)
-{
-	if(width==0)
-		throw invalid_operation("Texture1D::image");
-	if(level>=levels)
-		throw out_of_range("Texture1D::image");
-
-	if(ARB_texture_storage)
-		return sub_image(level, 0, get_level_size(level), data);
-
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(target, id);
-
-	image_(level, data);
-
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap_();
-		allocated |= (1<<levels)-1;
-	}
-
-	glBindTexture(target, 0);
-}
-
-void Texture1D::image_(unsigned level, const void *data)
-{
-	if(!allocated)
 	{
+		bind_scratch();
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-		apply_swizzle();
+		GLenum comp = get_gl_components(get_components(storage_fmt));
+		GLenum type = get_gl_type(get_component_type(storage_fmt));
+		for(unsigned i=0; i<levels; ++i)
+			glTexImage1D(target, i, gl_fmt, get_level_size(i), 0, comp, type, 0);
 	}
 
-	PixelComponents comp = get_components(storage_fmt);
-	GLenum type = get_gl_type(get_component_type(storage_fmt));
-	glTexImage1D(target, level, storage_fmt, get_level_size(level), 0, comp, type, data);
-
-	allocated |= 1<<level;
+	apply_swizzle();
 }
 
-void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+void Texture1D::image(unsigned level, const void *data)
 {
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("Texture1D::image");
-	image(level, data);
+	return sub_image(level, 0, get_level_size(level), data);
 }
 
 void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
@@ -127,34 +69,15 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
 	if(level>=levels)
 		throw out_of_range("Texture1D::sub_image");
 
-	bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
-	if(!direct)
-	{
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(target, id);
-	}
-
-	allocate_(level);
-
-	PixelComponents comp = get_components(storage_fmt);
+	GLenum comp = get_gl_components(get_components(storage_fmt));
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
 	if(ARB_direct_state_access)
 		glTextureSubImage1D(id, level, x, wd, comp, type, data);
 	else
+	{
+		bind_scratch();
 		glTexSubImage1D(target, level, x, wd, comp, type, data);
-
-	if(auto_gen_mipmap && level==0)
-		generate_mipmap_();
-
-	if(!direct)
-		glBindTexture(target, 0);
-}
-
-void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelComponents comp, DataType type, const void *data)
-{
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("Texture1D::sub_image");
-	sub_image(level, x, wd, data);
+	}
 }
 
 void Texture1D::image(const Graphics::Image &img, unsigned lv)
@@ -181,7 +104,7 @@ unsigned Texture1D::get_level_size(unsigned level) const
 	return width>>level;
 }
 
-UInt64 Texture1D::get_data_size() const
+uint64_t Texture1D::get_data_size() const
 {
 	return id ? width*get_pixel_size(storage_fmt) : 0;
 }