X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture.cpp;h=187c2533acbea6fc9e30c33370ffb99ca2a15a18;hb=57de40e1e802e44ae5b4caa67b0bb8763828b5c3;hp=aec1bc92da90b9b84f8882991f9b6bf4a24d84c2;hpb=47abe7c9e1633ca65f910a4db340724117a6f6e5;p=libs%2Fgl.git

diff --git a/source/texture.cpp b/source/texture.cpp
index aec1bc92..187c2533 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,3 +1,5 @@
+#include <msp/gl/extensions/arb_shadow.h>
+#include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/gl/extensions/ext_texture_filter_anisotropic.h>
 #include <msp/gl/extensions/sgis_generate_mipmap.h>
 #include <msp/strings/format.h>
@@ -65,6 +67,9 @@ Texture::Texture(GLenum t, ResourceManager *m):
 
 Texture::~Texture()
 {
+	while(TexUnit *unit = TexUnit::find_unit(this))
+		unbind_from(unit->get_index());
+
 	if(id)
 		glDeleteTextures(1, &id);
 }
@@ -96,7 +101,7 @@ void Texture::update_parameter(int mask) const
 	if(mask&WRAP_R)
 		glTexParameteri(target, GL_TEXTURE_WRAP_R, wrap_r);
 	if(mask&GENERATE_MIPMAP)
-		glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, gen_mipmap);
+		glTexParameteri(target, GL_GENERATE_MIPMAP, gen_mipmap);
 	if(mask&COMPARE)
 		glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
 	if(mask&COMPARE_FUNC)
@@ -135,7 +140,8 @@ void Texture::set_wrap(TextureWrap w)
 {
 	set_wrap_s(w);
 	set_wrap_t(w);
-	set_wrap_r(w);
+	if(EXT_texture3D)
+		set_wrap_r(w);
 }
 
 void Texture::set_wrap_s(TextureWrap w)
@@ -152,6 +158,7 @@ void Texture::set_wrap_t(TextureWrap w)
 
 void Texture::set_wrap_r(TextureWrap w)
 {
+	static Require _req(EXT_texture3D);
 	wrap_r = w;
 	update_parameter(WRAP_R);
 }
@@ -166,18 +173,31 @@ void Texture::set_generate_mipmap(bool gm)
 
 void Texture::set_compare_enabled(bool c)
 {
+	static Require _req(ARB_shadow);
 	compare = c;
 	update_parameter(COMPARE);
 }
 
 void Texture::set_compare_func(Predicate f)
 {
+	static Require _req(ARB_shadow);
 	cmp_func = f;
 	update_parameter(COMPARE_FUNC);
 }
 
 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);
 	const Texture *cur = unit.get_texture();
 	if(unit.set_texture(this))