Use explicit mipmap generation if necessary

[libs/gl.git] / source / texture.cpp

diff --git a/source/texture.cpp b/source/texture.cpp
index 187c2533acbea6fc9e30c33370ffb99ca2a15a18..22bdebdfd2a02eca284a0183c29a2f942b7a1631 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,4 +1,5 @@
 #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>
@@ -168,7 +169,18 @@ 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)
@@ -199,17 +211,20 @@ void Texture::bind_to(unsigned i) const
        }
 
        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)
@@ -233,7 +248,8 @@ void Texture::unbind_from(unsigned i)
        {
                unit.bind();
                glBindTexture(cur->target, 0);
-               glDisable(cur->target);
+               if(unit.supports_legacy())
+                       glDisable(cur->target);
        }
 }