Prefer explicit mipmap generation with glGenerateMipmap

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

diff --git a/source/texture.cpp b/source/texture.cpp
index 22bdebdfd2a02eca284a0183c29a2f942b7a1631..fe27a04d9ddd830fa93f21d51052ec0ffc0da8cd 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -3,6 +3,7 @@
 #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/io/memory.h>
 #include <msp/strings/format.h>
 #include "error.h"
 #include "resourcemanager.h"
@@ -75,6 +76,11 @@ Texture::~Texture()
                glDeleteTextures(1, &id);
 }
 
+DataType Texture::get_alloc_type(PixelFormat fmt)
+{
+       return (get_base_pixelformat(fmt)==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
+}
+
 void Texture::update_parameter(int mask) const
 {
        if(TexUnit::current().get_texture()!=this)
@@ -166,26 +172,24 @@ void Texture::set_wrap_r(TextureWrap w)
 
 void Texture::set_generate_mipmap(bool gm)
 {
-       if(gm)
+       if(gm && !EXT_framebuffer_object)
                static Require _req(SGIS_generate_mipmap);
        gen_mipmap = gm;
-       if(get_gl_api()!=OPENGL_ES2)
+       if(!EXT_framebuffer_object)
                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 is defined here
+       if(EXT_framebuffer_object)
                glGenerateMipmap(target);
-       }
 }
 
 void Texture::set_compare_enabled(bool c)
 {
-       static Require _req(ARB_shadow);
+       if(c)
+               static Require _req(ARB_shadow);
        compare = c;
        update_parameter(COMPARE);
 }
@@ -197,6 +201,14 @@ void Texture::set_compare_func(Predicate f)
        update_parameter(COMPARE_FUNC);
 }
 
+void Texture::load_image(const string &fn, bool srgb)
+{
+       Graphics::Image img;
+       img.load_file(fn);
+
+       image(img, srgb);
+}
+
 void Texture::bind_to(unsigned i) const
 {
        if(!id)
@@ -273,10 +285,12 @@ void Texture::Loader::init()
        else
                srgb = false;
 
+       add("external_image", &Loader::external_image);
        add("filter", &Loader::filter);
-       add("max_anisotropy", &Loader::max_anisotropy);
        add("generate_mipmap", &Loader::generate_mipmap);
+       add("image_data", &Loader::image_data);
        add("mag_filter", &Loader::mag_filter);
+       add("max_anisotropy", &Loader::max_anisotropy);
        add("min_filter", &Loader::min_filter);
        add("wrap",       &Loader::wrap);
        add("wrap_r",     &Loader::wrap_r);
@@ -284,6 +298,15 @@ void Texture::Loader::init()
        add("wrap_t",     &Loader::wrap_t);
 }
 
+void Texture::Loader::external_image(const string &fn)
+{
+       Graphics::Image img;
+       RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
+       img.load_io(*io);
+
+       obj.image(img, srgb);
+}
+
 void Texture::Loader::filter(TextureFilter f)
 {
        obj.set_filter(f);
@@ -294,6 +317,15 @@ void Texture::Loader::generate_mipmap(bool gm)
        obj.set_generate_mipmap(gm);
 }
 
+void Texture::Loader::image_data(const string &data)
+{
+       Graphics::Image img;
+       IO::Memory mem(data.data(), data.size());
+       img.load_io(mem);
+
+       obj.image(img, srgb);
+}
+
 void Texture::Loader::mag_filter(TextureFilter f)
 {
        obj.set_mag_filter(f);
@@ -329,5 +361,12 @@ void Texture::Loader::wrap_t(TextureWrap w)
        obj.set_wrap_t(w);
 }
 
+
+bool is_mipmapped(TextureFilter filter)
+{
+       return (filter==NEAREST_MIPMAP_NEAREST || filter==NEAREST_MIPMAP_LINEAR ||
+               filter==LINEAR_MIPMAP_NEAREST || filter==LINEAR_MIPMAP_LINEAR);
+}
+
 } // namespace GL
 } // namespace Msp