#include <msp/gl/extensions/arb_direct_state_access.h>
-#include <msp/gl/extensions/arb_shadow.h>
#include <msp/gl/extensions/arb_texture_swizzle.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 "bindable.h"
#include "error.h"
#include "resourcemanager.h"
#include "resources.h"
namespace Msp {
namespace GL {
-void operator>>(const LexicalConverter &c, TextureFilter &tf)
-{
- if(c.get()=="NEAREST")
- tf = NEAREST;
- else if(c.get()=="LINEAR")
- tf = LINEAR;
- else if(c.get()=="NEAREST_MIPMAP_NEAREST")
- tf = NEAREST_MIPMAP_NEAREST;
- else if(c.get()=="NEAREST_MIPMAP_LINEAR")
- tf = NEAREST_MIPMAP_LINEAR;
- else if(c.get()=="LINEAR_MIPMAP_NEAREST")
- tf = LINEAR_MIPMAP_NEAREST;
- else if(c.get()=="LINEAR_MIPMAP_LINEAR")
- tf = LINEAR_MIPMAP_LINEAR;
- else
- throw lexical_error(format("conversion of '%s' to TextureFilter", c.get()));
-}
-
-
-void operator>>(const LexicalConverter &c, TextureWrap &tw)
-{
- if(c.get()=="REPEAT")
- tw = REPEAT;
- else if(c.get()=="CLAMP_TO_EDGE")
- tw = CLAMP_TO_EDGE;
- else if(c.get()=="MIRRORED_REPEAT")
- tw = MIRRORED_REPEAT;
- else
- throw lexical_error(format("conversion of '%s' to TextureWrap", c.get()));
-}
-
-
int Texture::swizzle_orders[] =
{
GL_RED, GL_GREEN, GL_BLUE, GL_ALPHA,
Texture::Texture(GLenum t, ResourceManager *m):
id(0),
target(t),
- ifmt(RGB),
- min_filter(NEAREST_MIPMAP_LINEAR),
- mag_filter(LINEAR),
- mipmap_levels(0),
- max_anisotropy(1.0f),
- wrap_s(REPEAT),
- wrap_t(REPEAT),
- wrap_r(REPEAT),
- gen_mipmap(false),
- compare(false),
- cmp_func(LEQUAL),
- dirty_params(0)
+ ifmt(RGB8),
+ swizzle(NO_SWIZZLE),
+ auto_gen_mipmap(false),
+ default_sampler(*this)
{
if(m)
set_manager(m);
glDeleteTextures(1, &id);
}
-DataType Texture::get_alloc_type(PixelFormat fmt)
-{
- return (get_base_pixelformat(fmt)==DEPTH_COMPONENT ? UNSIGNED_SHORT : UNSIGNED_BYTE);
-}
-
void Texture::set_internal_format(PixelFormat fmt)
{
- if(!get_component_size(fmt) && OES_required_internalformat)
- fmt = get_default_sized_pixelformat(fmt);
-
+ PixelComponents comp = get_components(fmt);
FormatSwizzle swiz = NO_SWIZZLE;
- if(ARB_texture_rg && ARB_texture_swizzle)
+ switch(comp)
{
- if(fmt==LUMINANCE8 || fmt==SLUMINANCE8)
- {
- fmt = R8;
- swiz = R_TO_LUMINANCE;
- }
- else if(fmt==LUMINANCE8_ALPHA8 || fmt==SLUMINANCE8_ALPHA8)
- {
- fmt = RG8;
- swiz = RG_TO_LUMINANCE_ALPHA;
- }
+ case LUMINANCE:
+ comp = RED;
+ swiz = R_TO_LUMINANCE;
+ break;
+ case LUMINANCE_ALPHA:
+ comp = RG;
+ swiz = RG_TO_LUMINANCE_ALPHA;
+ break;
+ default:;
}
+ fmt = make_pixelformat(comp, get_component_type(fmt));
require_pixelformat(fmt);
+ if(swiz!=NO_SWIZZLE)
+ static Require _req(ARB_texture_swizzle);
ifmt = fmt;
swizzle = swiz;
- if(swizzle)
- update_parameter(FORMAT_SWIZZLE);
}
-PixelFormat Texture::get_upload_format(PixelFormat fmt) const
+PixelComponents Texture::get_upload_components(PixelComponents comp) const
{
- if(fmt==LUMINANCE || fmt==LUMINANCE_ALPHA)
- return get_base_pixelformat(ifmt);
+ if(comp==LUMINANCE || comp==LUMINANCE_ALPHA)
+ return get_components(ifmt);
else
- return fmt;
+ return comp;
}
-void Texture::update_parameter(int mask) const
+void Texture::apply_swizzle()
{
- if(!ARB_direct_state_access && TexUnit::current().get_texture()!=this)
- {
- TexUnit *unit = TexUnit::find_unit(this);
- if(!unit)
- {
- dirty_params |= mask;
- return;
- }
+ if(swizzle==NO_SWIZZLE)
+ return;
- unit->bind();
+ if(get_gl_api()==OPENGL_ES2)
+ {
+ set_parameter_i(GL_TEXTURE_SWIZZLE_R, swizzle_orders[swizzle*4]);
+ set_parameter_i(GL_TEXTURE_SWIZZLE_G, swizzle_orders[swizzle*4+1]);
+ set_parameter_i(GL_TEXTURE_SWIZZLE_B, swizzle_orders[swizzle*4+2]);
+ set_parameter_i(GL_TEXTURE_SWIZZLE_A, swizzle_orders[swizzle*4+3]);
}
-
- if(mask&MIN_FILTER)
- set_parameter_i(GL_TEXTURE_MIN_FILTER, min_filter);
- if(mask&MAG_FILTER)
- set_parameter_i(GL_TEXTURE_MAG_FILTER, mag_filter);
- if(mask&MAX_ANISOTROPY)
- set_parameter_f(GL_TEXTURE_MAX_ANISOTROPY_EXT, max_anisotropy);
- if(mask&WRAP_S)
- set_parameter_i(GL_TEXTURE_WRAP_S, wrap_s);
- if(mask&WRAP_T)
- set_parameter_i(GL_TEXTURE_WRAP_T, wrap_t);
- if(mask&WRAP_R)
- set_parameter_i(GL_TEXTURE_WRAP_R, wrap_r);
- if(mask&GENERATE_MIPMAP)
- set_parameter_i(GL_GENERATE_MIPMAP, gen_mipmap);
- if(mask&COMPARE)
- set_parameter_i(GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
- if(mask&COMPARE_FUNC)
- set_parameter_i(GL_TEXTURE_COMPARE_FUNC, cmp_func);
- if(mask&FORMAT_SWIZZLE)
+ else
{
- if(get_gl_api()==OPENGL_ES2)
- {
- set_parameter_i(GL_TEXTURE_SWIZZLE_R, swizzle_orders[swizzle*4]);
- set_parameter_i(GL_TEXTURE_SWIZZLE_G, swizzle_orders[swizzle*4+1]);
- set_parameter_i(GL_TEXTURE_SWIZZLE_B, swizzle_orders[swizzle*4+2]);
- set_parameter_i(GL_TEXTURE_SWIZZLE_A, swizzle_orders[swizzle*4+3]);
- }
+ if(ARB_direct_state_access)
+ glTextureParameteriv(id, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
else
- {
- if(ARB_direct_state_access)
- glTextureParameteriv(id, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
- else
- glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
- }
+ glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, swizzle_orders+swizzle*4);
}
- if(mask&MIPMAP_LEVELS)
- set_parameter_i(GL_TEXTURE_MAX_LEVEL, (mipmap_levels ? mipmap_levels-1 : 1000));
}
void Texture::set_parameter_i(GLenum param, int value) const
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)
{
- min_filter = f;
- update_parameter(MIN_FILTER);
+ default_sampler.set_min_filter(f);
}
void Texture::set_mag_filter(TextureFilter f)
{
- mag_filter = f;
- update_parameter(MAG_FILTER);
+ default_sampler.set_mag_filter(f);
}
void Texture::set_filter(TextureFilter f)
{
- set_min_filter(f);
- set_mag_filter(f==NEAREST ? NEAREST : LINEAR);
-}
-
-void Texture::set_mipmap_levels(unsigned l)
-{
- mipmap_levels = l;
- update_parameter(MIPMAP_LEVELS);
+ default_sampler.set_filter(f);
}
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;
- if(EXT_texture_filter_anisotropic)
- update_parameter(MAX_ANISOTROPY);
+ default_sampler.set_max_anisotropy(a);
}
void Texture::set_wrap(TextureWrap w)
{
- set_wrap_s(w);
- set_wrap_t(w);
- if(EXT_texture3D)
- set_wrap_r(w);
+ default_sampler.set_wrap(w);
}
void Texture::set_wrap_s(TextureWrap w)
{
- wrap_s = w;
- update_parameter(WRAP_S);
+ default_sampler.set_wrap_s(w);
}
void Texture::set_wrap_t(TextureWrap w)
{
- wrap_t = w;
- update_parameter(WRAP_T);
+ default_sampler.set_wrap_t(w);
}
void Texture::set_wrap_r(TextureWrap w)
{
- static Require _req(EXT_texture3D);
- wrap_r = w;
- update_parameter(WRAP_R);
+ default_sampler.set_wrap_r(w);
}
bool Texture::can_generate_mipmap()
{
- return (EXT_framebuffer_object || SGIS_generate_mipmap);
+ return EXT_framebuffer_object;
}
-void Texture::set_generate_mipmap(bool gm)
-{
- if(gm && !EXT_framebuffer_object)
- static Require _req(SGIS_generate_mipmap);
- gen_mipmap = gm;
- if(!EXT_framebuffer_object)
- update_parameter(GENERATE_MIPMAP);
-}
-
-void Texture::auto_generate_mipmap()
+void Texture::generate_mipmap()
{
// glGenerateMipmap is defined here
- if(EXT_framebuffer_object)
+ static Require _req(EXT_framebuffer_object);
+
+ if(ARB_direct_state_access)
+ glGenerateTextureMipmap(id);
+ else
{
- if(ARB_direct_state_access)
- glGenerateTextureMipmap(id);
- else
- glGenerateMipmap(target);
+ BindRestore _bind(this);
+ glGenerateMipmap(target);
}
}
+void Texture::set_auto_generate_mipmap(bool gm)
+{
+ if(gm)
+ static Require _req(EXT_framebuffer_object);
+
+ auto_gen_mipmap = gm;
+}
+
void Texture::set_compare_enabled(bool c)
{
if(c)
- static Require _req(ARB_shadow);
- compare = c;
- update_parameter(COMPARE);
+ default_sampler.set_compare(default_sampler.get_compare_function());
+ else
+ default_sampler.disable_compare();
}
void Texture::set_compare_func(Predicate f)
{
- static Require _req(ARB_shadow);
- cmp_func = f;
- update_parameter(COMPARE_FUNC);
+ default_sampler.set_compare(f);
}
void Texture::load_image(const string &fn, bool srgb)
+{
+ load_image(fn, 0, srgb);
+}
+
+void Texture::load_image(const string &fn, unsigned lv, bool srgb)
{
Graphics::Image img;
img.load_file(fn);
- image(img, srgb);
+ image(img, lv, srgb);
+}
+
+void Texture::image(const Graphics::Image &img, bool srgb)
+{
+ image(img, 0, srgb);
}
-void Texture::bind_to(unsigned i, bool legacy) const
+void Texture::bind_to(unsigned i) const
{
if(!id)
{
}
}
- legacy = (legacy && is_legacy_target(target));
-
TexUnit &unit = TexUnit::get_unit(i);
- const Texture *old = unit.get_texture();
- bool old_legacy = unit.get_texture_legacy();
- if(unit.set_texture(this, legacy))
+ if(unit.set_texture(this))
{
if(manager)
manager->resource_used(*this);
- if(ARB_direct_state_access && !old_legacy && (!unit.supports_legacy() || !legacy))
+ if(ARB_direct_state_access)
glBindTextureUnit(i, id);
else
{
unit.bind();
- if(unit.supports_legacy())
- {
- if(old && old->target!=target && old_legacy)
- glDisable(old->target);
- if((!old || old->target!=target) && legacy)
- glEnable(target);
- }
glBindTexture(target, id);
}
- if(dirty_params)
- {
- update_parameter(dirty_params);
- dirty_params = 0;
- }
+ default_sampler.bind_to(i);
}
}
{
TexUnit &unit = TexUnit::get_unit(i);
const Texture *cur = unit.get_texture();
- bool legacy = unit.get_texture_legacy();
if(unit.set_texture(0))
{
- if(ARB_direct_state_access && !legacy)
+ if(ARB_direct_state_access)
glBindTextureUnit(i, 0);
else
{
unit.bind();
glBindTexture(cur->target, 0);
- if(unit.supports_legacy() && legacy)
- glDisable(cur->target);
}
}
}
-bool Texture::is_legacy_target(GLenum target)
-{
- return target<GL_TEXTURE_1D_ARRAY;
-}
-
Texture::Loader::Loader(Texture &t):
DataFile::CollectionObjectLoader<Texture>(t, 0)
void Texture::Loader::init()
{
+ levels = 0;
if(Resources *res = dynamic_cast<Resources *>(coll))
srgb = res->get_srgb_conversion();
else
add("max_anisotropy", &Loader::max_anisotropy);
add("min_filter", &Loader::min_filter);
add("mipmap_levels", &Loader::mipmap_levels);
+ add("sampler", &Loader::sampler);
add("wrap", &Loader::wrap);
add("wrap_r", &Loader::wrap_r);
add("wrap_s", &Loader::wrap_s);
add("wrap_t", &Loader::wrap_t);
}
+unsigned Texture::Loader::get_levels() const
+{
+ return (is_mipmapped(obj.default_sampler.get_min_filter()) ? levels : 1);
+}
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
void Texture::Loader::external_image(const string &fn)
{
Graphics::Image img;
throw IO::file_not_found(fn);
img.load_io(*io);
- obj.image(img, srgb);
+ obj.image(img, get_levels(), srgb);
}
void Texture::Loader::filter(TextureFilter f)
void Texture::Loader::generate_mipmap(bool gm)
{
- obj.set_generate_mipmap(gm);
+ obj.set_auto_generate_mipmap(gm);
}
void Texture::Loader::image_data(const string &data)
IO::Memory mem(data.data(), data.size());
img.load_io(mem);
- obj.image(img, srgb);
+ obj.image(img, get_levels(), srgb);
}
void Texture::Loader::mag_filter(TextureFilter f)
void Texture::Loader::mipmap_levels(unsigned l)
{
- obj.set_mipmap_levels(l);
+ levels = l;
+}
+
+void Texture::Loader::sampler()
+{
+ load_sub(obj.default_sampler);
}
void Texture::Loader::wrap(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);
-}
+#pragma GCC diagnostic pop
} // namespace GL
} // namespace Msp
projects / libs / gl.git / blobdiff