+#include <msp/gl/extensions/arb_shadow.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 "sgis_generate_mipmap.h"
+#include "resourcemanager.h"
+#include "resources.h"
#include "texture.h"
#include "texunit.h"
}
-Texture::Texture(GLenum t):
+Texture::Texture(GLenum t, ResourceManager *m):
+ id(0),
target(t),
min_filter(NEAREST_MIPMAP_LINEAR),
mag_filter(LINEAR),
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
{
- if(current()==this)
+ if(TexUnit::current().get_texture()!=this)
{
- if(mask&MIN_FILTER)
- glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter);
- if(mask&MAG_FILTER)
- glTexParameteri(target, GL_TEXTURE_MAG_FILTER, mag_filter);
- if(mask&WRAP_S)
- glTexParameteri(target, GL_TEXTURE_WRAP_S, wrap_s);
- if(mask&WRAP_T)
- glTexParameteri(target, GL_TEXTURE_WRAP_T, wrap_t);
- if(mask&WRAP_R)
- glTexParameteri(target, GL_TEXTURE_WRAP_R, wrap_r);
- if(mask&GENERATE_MIPMAP)
- glTexParameteri(target, GL_GENERATE_MIPMAP_SGIS, gen_mipmap);
- if(mask&COMPARE)
- glTexParameteri(target, GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
- if(mask&COMPARE_FUNC)
- glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func);
+ TexUnit *unit = TexUnit::find_unit(this);
+ if(!unit)
+ {
+ dirty_params |= mask;
+ return;
+ }
+
+ unit->bind();
}
- else
- dirty_params |= mask;
+
+ if(mask&MIN_FILTER)
+ glTexParameteri(target, GL_TEXTURE_MIN_FILTER, min_filter);
+ if(mask&MAG_FILTER)
+ glTexParameteri(target, GL_TEXTURE_MAG_FILTER, mag_filter);
+ if(mask&MAX_ANISOTROPY)
+ glTexParameteri(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
+ if(mask&WRAP_S)
+ glTexParameteri(target, GL_TEXTURE_WRAP_S, wrap_s);
+ if(mask&WRAP_T)
+ glTexParameteri(target, GL_TEXTURE_WRAP_T, wrap_t);
+ if(mask&WRAP_R)
+ glTexParameteri(target, GL_TEXTURE_WRAP_R, wrap_r);
+ if(mask&GENERATE_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)
+ glTexParameteri(target, GL_TEXTURE_COMPARE_FUNC, cmp_func);
}
void Texture::set_min_filter(TextureFilter f)
update_parameter(MAG_FILTER);
}
+void Texture::set_filter(TextureFilter f)
+{
+ set_min_filter(f);
+ set_mag_filter(f==NEAREST ? NEAREST : LINEAR);
+}
+
+void Texture::set_max_anisotropy(float a)
+{
+ if(a<1.0f)
+ throw invalid_argument("Texture::set_max_anisotropy");
+ else if(a>1.0f)
+ static Require _req(EXT_texture_filter_anisotropic);
+ max_anisotropy = a;
+ update_parameter(MAX_ANISOTROPY);
+}
+
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)
void Texture::set_wrap_r(TextureWrap w)
{
+ static Require _req(EXT_texture3D);
wrap_r = w;
update_parameter(WRAP_R);
}
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() const
+void Texture::bind_to(unsigned i) const
{
- const Texture *cur = TexUnit::current().get_texture();
- if(cur!=this)
+ if(!id)
{
- if(cur && cur->target!=target)
- glDisable(cur->target);
- if(!cur || cur->target!=target)
- glEnable(target);
+ if(manager)
+ manager->resource_used(*this);
+ if(!id)
+ {
+ unbind_from(i);
+ return;
+ }
+ }
+ TexUnit &unit = TexUnit::get_unit(i);
+ const Texture *old = unit.get_texture();
+ if(unit.set_texture(this))
+ {
+ if(manager)
+ manager->resource_used(*this);
+
+ unit.bind();
+ if(unit.supports_legacy())
+ {
+ if(old && old->target!=target)
+ glDisable(old->target);
+ if(!old || old->target!=target)
+ glEnable(target);
+ }
glBindTexture(target, id);
- TexUnit::current().set_texture(this);
if(dirty_params)
{
}
}
-void Texture::bind_to(unsigned i) const
+const Texture *Texture::current(unsigned i)
{
- TexUnit::activate(i);
- bind();
+ return TexUnit::get_unit(i).get_texture();
}
-const Texture *Texture::current()
+void Texture::unbind_from(unsigned i)
{
- return TexUnit::current().get_texture();
+ TexUnit &unit = TexUnit::get_unit(i);
+ const Texture *cur = unit.get_texture();
+ if(unit.set_texture(0))
+ {
+ unit.bind();
+ glBindTexture(cur->target, 0);
+ if(unit.supports_legacy())
+ glDisable(cur->target);
+ }
}
-void Texture::unbind()
-{
- const Texture *cur = TexUnit::current().get_texture();
- if(!cur)
- return;
- glBindTexture(cur->target, 0);
- glDisable(cur->target);
- TexUnit::current().set_texture(0);
+Texture::Loader::Loader(Texture &t):
+ DataFile::CollectionObjectLoader<Texture>(t, 0)
+{
+ init();
}
-void Texture::unbind_from(unsigned i)
+Texture::Loader::Loader(Texture &t, Collection &c):
+ DataFile::CollectionObjectLoader<Texture>(t, &c)
{
- TexUnit::activate(i);
- unbind();
+ init();
}
-
-Texture::Loader::Loader(Texture &t):
- DataFile::ObjectLoader<Texture>(t)
+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);
add("mag_filter", &Loader::mag_filter);
add("min_filter", &Loader::min_filter);
add("wrap_t", &Loader::wrap_t);
}
+void Texture::Loader::filter(TextureFilter f)
+{
+ obj.set_filter(f);
+}
+
void Texture::Loader::generate_mipmap(bool gm)
{
obj.set_generate_mipmap(gm);
obj.set_mag_filter(f);
}
+void Texture::Loader::max_anisotropy(float a)
+{
+ obj.set_max_anisotropy(a);
+}
+
void Texture::Loader::min_filter(TextureFilter f)
{
obj.set_min_filter(f);
projects / libs / gl.git / blobdiff