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

diff --git a/source/texture.cpp b/source/texture.cpp
index aec1bc92..8d43143c 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,3 +1,6 @@
+#include <msp/gl/extensions/arb_shadow.h>
+#include <msp/gl/extensions/ext_framebuffer_object.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,10 +68,18 @@ 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);
 }
 
+DataType Texture::get_alloc_type(PixelFormat fmt)
+{
+	return (fmt==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
+}
+
 void Texture::update_parameter(int mask) const
 {
 	if(TexUnit::current().get_texture()!=this)
@@ -96,7 +107,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 +146,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 +164,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);
 }
@@ -161,35 +174,63 @@ void Texture::set_generate_mipmap(bool gm)
 	if(gm)
 		static Require _req(SGIS_generate_mipmap);
 	gen_mipmap = gm;
-	update_parameter(GENERATE_MIPMAP);
+	if(get_gl_api()!=OPENGL_ES2)
+		update_parameter(GENERATE_MIPMAP);
+}
+
+void Texture::auto_generate_mipmap()
+{
+	if(get_gl_api()==OPENGL_ES2)
+	{
+		// glGenerateMipmap is defined here
+		static Require _req(EXT_framebuffer_object);
+		glGenerateMipmap(target);
+	}
 }
 
 void Texture::set_compare_enabled(bool c)
 {
+	if(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();
+	const Texture *old = unit.get_texture();
 	if(unit.set_texture(this))
 	{
 		if(manager)
 			manager->resource_used(*this);
 
 		unit.bind();
-		if(cur && cur->target!=target)
-			glDisable(cur->target);
-		if(!cur || cur->target!=target)
-			glEnable(target);
+		if(unit.supports_legacy())
+		{
+			if(old && old->target!=target)
+				glDisable(old->target);
+			if(!old || old->target!=target)
+				glEnable(target);
+		}
 		glBindTexture(target, id);
 
 		if(dirty_params)
@@ -213,7 +254,8 @@ void Texture::unbind_from(unsigned i)
 	{
 		unit.bind();
 		glBindTexture(cur->target, 0);
-		glDisable(cur->target);
+		if(unit.supports_legacy())
+			glDisable(cur->target);
 	}
 }