X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.cpp;h=7c3f02ab5f97988af099937eb6ed52254542b332;hb=6065f6622cc275dc0b20baaf7c267e71169d18f3;hp=742857be725b4ed205b369c43d823f5b0812af14;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 742857be..7c3f02ab 100644
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -1,8 +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"
 #include "texture1d.h"
 
@@ -22,7 +20,11 @@ Texture1D::Texture1D():
 void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
 {
 	if(width>0)
-		throw invalid_operation("Texture1D::storage");
+	{
+		if(fmt!=format || wd!=width || (lv && lv!=levels))
+			throw incompatible_data("Texture1D::storage");
+		return;
+	}
 	if(wd==0)
 		throw invalid_argument("Texture1D::storage");
 
@@ -44,11 +46,14 @@ void Texture1D::allocate(unsigned level)
 
 	if(ARB_texture_storage)
 	{
-		Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
+		GLenum fmt = get_gl_pixelformat(storage_fmt);
 		if(ARB_direct_state_access)
-			glTextureStorage1D(id, levels, storage_fmt, width);
+			glTextureStorage1D(id, levels, fmt, width);
 		else
-			glTexStorage1D(target, levels, storage_fmt, width);
+		{
+			bind_scratch();
+			glTexStorage1D(target, levels, fmt, width);
+		}
 		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
@@ -60,13 +65,13 @@ void Texture1D::image(unsigned level, const void *data)
 {
 	if(width==0)
 		throw invalid_operation("Texture1D::image");
-
-	unsigned w = get_level_size(level);
+	if(level>=levels)
+		throw out_of_range("Texture1D::image");
 
 	if(ARB_texture_storage)
-		return sub_image(level, 0, w, data);
+		return sub_image(level, 0, get_level_size(level), data);
 
-	BindRestore _bind(this);
+	bind_scratch();
 
 	if(!allocated)
 	{
@@ -74,49 +79,32 @@ void Texture1D::image(unsigned level, const void *data)
 		apply_swizzle();
 	}
 
-	PixelComponents comp = get_components(storage_fmt);
-	DataType type = get_component_type(storage_fmt);
-	glTexImage1D(target, level, storage_fmt, w, 0, comp, type, data);
+	GLenum fmt = get_gl_pixelformat(storage_fmt);
+	GLenum comp = get_gl_components(get_components(storage_fmt));
+	GLenum type = get_gl_type(get_component_type(storage_fmt));
+	glTexImage1D(target, level, fmt, get_level_size(level), 0, comp, type, data);
 
 	allocated |= 1<<level;
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap();
-		allocated |= (1<<levels)-1;
-	}
-}
-
-void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
-{
-	if(comp!=get_components(format) || type!=get_component_type(format))
-		throw incompatible_data("Texture1D::image");
-	image(level, data);
 }
 
 void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
 {
 	if(width==0)
-		throw invalid_operation("Texture3D::image");
+		throw invalid_operation("Texture1D::sub_image");
+	if(level>=levels)
+		throw out_of_range("Texture1D::sub_image");
 
-	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
-	PixelComponents comp = get_components(storage_fmt);
-	DataType type = get_component_type(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();
-}
-
-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)
@@ -126,10 +114,7 @@ void Texture1D::image(const Graphics::Image &img, unsigned lv)
 
 	unsigned w = img.get_width();
 	PixelFormat fmt = pixelformat_from_image(img);
-	if(width==0)
-		storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, lv);
-	else if(w!=width)
-		throw incompatible_data("Texture1D::image");
+	storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, lv);
 
 	image(0, img.get_pixels());
 }
@@ -146,7 +131,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;
 }