Use explicit mipmap generation if necessary

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

diff --git a/source/texture.cpp b/source/texture.cpp
index fe8b7be9a3e4fbb56dda02464bfb0541d8e131ce..22bdebdfd2a02eca284a0183c29a2f942b7a1631 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -1,7 +1,12 @@
+#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>
 #include "error.h"
+#include "resourcemanager.h"
+#include "resources.h"
 #include "texture.h"
 #include "texunit.h"
 
@@ -42,7 +47,8 @@ void operator>>(const LexicalConverter &c, TextureWrap &tw)
 }
 
 
-Texture::Texture(GLenum t):
+Texture::Texture(GLenum t, ResourceManager *m):
+       id(0),
        target(t),
        min_filter(NEAREST_MIPMAP_LINEAR),
        mag_filter(LINEAR),
@@ -54,12 +60,19 @@ Texture::Texture(GLenum t):
        cmp_func(LEQUAL),
        dirty_params(0)
 {
-       glGenTextures(1, &id);
+       if(m)
+               set_manager(m);
+       else
+               glGenTextures(1, &id);
 }
 
 Texture::~Texture()
 {
-       glDeleteTextures(1, &id);
+       while(TexUnit *unit = TexUnit::find_unit(this))
+               unbind_from(unit->get_index());
+
+       if(id)
+               glDeleteTextures(1, &id);
 }
 
 void Texture::update_parameter(int mask) const
@@ -89,7 +102,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)
@@ -128,7 +141,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)
@@ -145,6 +159,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);
 }
@@ -154,32 +169,62 @@ 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)
 {
+       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)
@@ -203,14 +248,31 @@ void Texture::unbind_from(unsigned i)
        {
                unit.bind();
                glBindTexture(cur->target, 0);
-               glDisable(cur->target);
+               if(unit.supports_legacy())
+                       glDisable(cur->target);
        }
 }
 
 
 Texture::Loader::Loader(Texture &t):
-       DataFile::ObjectLoader<Texture>(t)
+       DataFile::CollectionObjectLoader<Texture>(t, 0)
 {
+       init();
+}
+
+Texture::Loader::Loader(Texture &t, Collection &c):
+       DataFile::CollectionObjectLoader<Texture>(t, &c)
+{
+       init();
+}
+
+void Texture::Loader::init()
+{
+       if(Resources *res = dynamic_cast<Resources *>(coll))
+               srgb = res->get_srgb_conversion();
+       else
+               srgb = false;
+
        add("filter", &Loader::filter);
        add("max_anisotropy", &Loader::max_anisotropy);
        add("generate_mipmap", &Loader::generate_mipmap);