X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;h=ed0b206c1e05069ada3d8e677c84995b706e920b;hb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784;hp=78f8c9e983034f34eadec903c5c53ffb4ffd6c5d;hpb=2b7f8e45e75bec30c1ea27fc0efd8286f67adc3f;p=libs%2Fgl.git

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 78f8c9e9..ed0b206c 100644
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -2,10 +2,8 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/graphics/imageloader.h>
-#include "bindable.h"
 #include "buffer.h"
 #include "error.h"
-#include "pixelstore.h"
 #include "resources.h"
 #include "texture2d.h"
 
@@ -77,11 +75,14 @@ void Texture2D::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)
-			glTextureStorage2D(id, levels, storage_fmt, width, height);
+			glTextureStorage2D(id, levels, fmt, width, height);
 		else
-			glTexStorage2D(target, levels, storage_fmt, width, height);
+		{
+			bind_scratch();
+			glTexStorage2D(target, levels, fmt, width, height);
+		}
 		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
@@ -101,7 +102,7 @@ void Texture2D::image(unsigned level, const void *data)
 	if(ARB_texture_storage)
 		return sub_image(level, 0, 0, size.x, size.y, data);
 
-	BindRestore _bind(this);
+	bind_scratch();
 
 	if(!allocated)
 	{
@@ -109,9 +110,10 @@ void Texture2D::image(unsigned level, const void *data)
 		apply_swizzle();
 	}
 
-	PixelComponents comp = get_components(storage_fmt);
+	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));
-	glTexImage2D(target, level, storage_fmt, size.x, size.y, 0, comp, type, data);
+	glTexImage2D(target, level, fmt, size.x, size.y, 0, comp, type, data);
 
 	allocated |= 1<<level;
 	if(auto_gen_mipmap && level==0)
@@ -135,15 +137,17 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	if(level>=levels)
 		throw out_of_range("Texture2D::sub_image");
 
-	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	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)
 		glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
 	else
+	{
+		bind_scratch();
 		glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
+	}
 
 	if(auto_gen_mipmap && level==0)
 		generate_mipmap();
@@ -168,9 +172,6 @@ void Texture2D::image(const Graphics::Image &img, unsigned lv, bool from_buffer)
 	PixelFormat fmt = pixelformat_from_image(img);
 	storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv);
 
-	PixelStore pstore = PixelStore::from_image(img);
-	BindRestore _bind_ps(pstore);
-
 	image(0, from_buffer ? 0 : img.get_pixels());
 }
 
@@ -290,7 +291,6 @@ bool Texture2D::AsyncLoader::process()
 		image.load_into(*img_loader, mapped_address);
 	else if(phase==3)
 	{
-		Bind _bind_buf(pixel_buffer, PIXEL_UNPACK_BUFFER);
 		mapped_address = 0;
 		if(!pixel_buffer.unmap())
 		{
@@ -300,7 +300,9 @@ bool Texture2D::AsyncLoader::process()
 
 		if(!texture.id)
 			texture.generate_id();
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer.get_id());
 		texture.image(image, 0, true);
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
 	}
 
 	++phase;