X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;h=3adc511e23ca2640d0ed7e5a4fc6644b50a65c40;hb=a92362ad19b65f66b98e0dc4d034da5e4eb5cf36;hp=ea503ed1f9d4414f28f200c89be286fdc49f6190;hpb=dbc91b65728ab9c0e574bb1127cfe4d2da55de7f;p=libs%2Fgl.git

diff --git a/source/core/texture.cpp b/source/core/texture.cpp
index ea503ed1..3adc511e 100644
--- a/source/core/texture.cpp
+++ b/source/core/texture.cpp
@@ -8,7 +8,6 @@
 #include "resourcemanager.h"
 #include "resources.h"
 #include "texture.h"
-#include "texunit.h"
 
 using namespace std;
 
@@ -36,13 +35,17 @@ Texture::Texture(GLenum t, ResourceManager *m):
 		set_manager(m);
 	else
 		generate_id();
+
+	static bool alignment_init = false;
+	if(!alignment_init)
+	{
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+		alignment_init = true;
+	}
 }
 
 Texture::~Texture()
 {
-	while(TexUnit *unit = TexUnit::find_unit(this))
-		unbind_from(unit->get_index());
-
 	if(id)
 		glDeleteTextures(1, &id);
 }
@@ -137,13 +140,22 @@ void Texture::generate_mipmap()
 	// glGenerateMipmap is defined here
 	static Require _req(EXT_framebuffer_object);
 
+	if(!ARB_direct_state_access)
+	{
+		glActiveTexture(GL_TEXTURE0);
+		glBindTexture(target, id);
+	}
+	generate_mipmap_();
+	if(!ARB_direct_state_access)
+		glBindTexture(target, 0);
+}
+
+void Texture::generate_mipmap_()
+{
 	if(ARB_direct_state_access)
 		glGenerateTextureMipmap(id);
 	else
-	{
-		BindRestore _bind(this);
 		glGenerateMipmap(target);
-	}
 }
 
 void Texture::set_auto_generate_mipmap(bool gm)
@@ -172,56 +184,6 @@ void Texture::image(const Graphics::Image &img, bool)
 	image(img, 0U);
 }
 
-void Texture::bind_to(unsigned i) const
-{
-	if(!id)
-	{
-		if(manager)
-			manager->resource_used(*this);
-		if(!id)
-		{
-			unbind_from(i);
-			return;
-		}
-	}
-
-	TexUnit &unit = TexUnit::get_unit(i);
-	if(unit.set_texture(this))
-	{
-		if(manager)
-			manager->resource_used(*this);
-
-		if(ARB_direct_state_access)
-			glBindTextureUnit(i, id);
-		else
-		{
-			unit.bind();
-			glBindTexture(target, id);
-		}
-	}
-}
-
-const Texture *Texture::current(unsigned i)
-{
-	return TexUnit::get_unit(i).get_texture();
-}
-
-void Texture::unbind_from(unsigned i)
-{
-	TexUnit &unit = TexUnit::get_unit(i);
-	const Texture *cur = unit.get_texture();
-	if(unit.set_texture(0))
-	{
-		if(ARB_direct_state_access)
-			glBindTextureUnit(i, 0);
-		else
-		{
-			unit.bind();
-			glBindTexture(cur->target, 0);
-		}
-	}
-}
-
 void Texture::set_debug_name(const string &name)
 {
 #ifdef DEBUG