]> git.tdb.fi Git - libs/gl.git/blobdiff - source/texture.cpp
Use ARB_direct_state_access to avoid some bind calls
[libs/gl.git] / source / texture.cpp
index d738bb36e9a63c2df69ef97a205e292b59aa5b49..581ec705690d556320bc412577a7ad8e5f4d0adb 100644 (file)
@@ -1,7 +1,13 @@
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#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/io/memory.h>
 #include <msp/strings/format.h>
 #include "error.h"
+#include "resourcemanager.h"
 #include "resources.h"
 #include "texture.h"
 #include "texunit.h"
@@ -43,7 +49,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),
@@ -55,17 +62,31 @@ Texture::Texture(GLenum t):
        cmp_func(LEQUAL),
        dirty_params(0)
 {
-       glGenTextures(1, &id);
+       if(m)
+               set_manager(m);
+       else if(ARB_direct_state_access)
+               glCreateTextures(target, 1, &id);
+       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);
+}
+
+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)
+       if(!ARB_direct_state_access && TexUnit::current().get_texture()!=this)
        {
                TexUnit *unit = TexUnit::find_unit(this);
                if(!unit)
@@ -78,23 +99,39 @@ void Texture::update_parameter(int mask) const
        }
 
        if(mask&MIN_FILTER)
-               glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter);
+               set_parameter_i(GL_TEXTURE_MIN_FILTER, min_filter);
        if(mask&MAG_FILTER)
-               glTexParameteri(target, GL_TEXTURE_MAG_FILTER, mag_filter);
+               set_parameter_i(GL_TEXTURE_MAG_FILTER, mag_filter);
        if(mask&MAX_ANISOTROPY)
-               glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
+               set_parameter_f(GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
        if(mask&WRAP_S)
-               glTexParameteri(target, GL_TEXTURE_WRAP_S, wrap_s);
+               set_parameter_i(GL_TEXTURE_WRAP_S, wrap_s);
        if(mask&WRAP_T)
-               glTexParameteri(target, GL_TEXTURE_WRAP_T, wrap_t);
+               set_parameter_i(GL_TEXTURE_WRAP_T, wrap_t);
        if(mask&WRAP_R)
-               glTexParameteri(target, GL_TEXTURE_WRAP_R, wrap_r);
+               set_parameter_i(GL_TEXTURE_WRAP_R, wrap_r);
        if(mask&GENERATE_MIPMAP)
-               glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, gen_mipmap);
+               set_parameter_i(GL_GENERATE_MIPMAP, gen_mipmap);
        if(mask&COMPARE)
-               glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
+               set_parameter_i(GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
        if(mask&COMPARE_FUNC)
-               glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func);
+               set_parameter_i(GL_TEXTURE_COMPARE_FUNC, cmp_func);
+}
+
+void Texture::set_parameter_i(GLenum param, int value) const
+{
+       if(ARB_direct_state_access)
+               glTextureParameteri(id, param, value);
+       else
+               glTexParameteri(target, param, value);
+}
+
+void Texture::set_parameter_f(GLenum param, float value) const
+{
+       if(ARB_direct_state_access)
+               glTextureParameterf(id, param, value);
+       else
+               glTexParameterf(target, param, value);
 }
 
 void Texture::set_min_filter(TextureFilter f)
@@ -129,7 +166,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)
@@ -146,41 +184,83 @@ 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);
 }
 
 void Texture::set_generate_mipmap(bool gm)
 {
-       if(gm)
+       if(gm && !EXT_framebuffer_object)
                static Require _req(SGIS_generate_mipmap);
        gen_mipmap = gm;
-       update_parameter(GENERATE_MIPMAP);
+       if(!EXT_framebuffer_object)
+               update_parameter(GENERATE_MIPMAP);
+}
+
+void Texture::auto_generate_mipmap()
+{
+       // glGenerateMipmap is defined here
+       if(EXT_framebuffer_object)
+       {
+               if(ARB_direct_state_access)
+                       glGenerateTextureMipmap(id);
+               else
+                       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::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)
+       {
+               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)
@@ -204,7 +284,8 @@ void Texture::unbind_from(unsigned i)
        {
                unit.bind();
                glBindTexture(cur->target, 0);
-               glDisable(cur->target);
+               if(unit.supports_legacy())
+                       glDisable(cur->target);
        }
 }
 
@@ -228,10 +309,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);
@@ -239,6 +322,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);
@@ -249,6 +341,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);
@@ -284,5 +385,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