#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"
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),
+ auto_gen_mipmap(false),
compare(false),
cmp_func(LEQUAL),
dirty_params(0)
void Texture::set_internal_format(PixelFormat fmt)
{
- if(!get_component_size(fmt) && OES_required_internalformat)
- fmt = get_default_sized_pixelformat(fmt);
-
FormatSwizzle swiz = NO_SWIZZLE;
if(ARB_texture_rg && ARB_texture_swizzle)
{
- if(fmt==LUMINANCE8 || fmt==SLUMINANCE8)
+ if(fmt==LUMINANCE)
{
- fmt = R8;
+ fmt = RED;
swiz = R_TO_LUMINANCE;
}
- else if(fmt==LUMINANCE8_ALPHA8 || fmt==SLUMINANCE8_ALPHA8)
+ else if(fmt==LUMINANCE_ALPHA)
{
- fmt = RG8;
+ fmt = RG;
swiz = RG_TO_LUMINANCE_ALPHA;
}
}
+ if(!get_component_size(fmt) && OES_required_internalformat)
+ fmt = get_default_sized_pixelformat(fmt);
+
require_pixelformat(fmt);
ifmt = fmt;
swizzle = swiz;
void Texture::update_parameter(int mask) const
{
+ if(!id)
+ {
+ dirty_params |= mask;
+ return;
+ }
+
if(!ARB_direct_state_access && TexUnit::current().get_texture()!=this)
{
TexUnit *unit = TexUnit::find_unit(this);
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)
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
set_mag_filter(f==NEAREST ? NEAREST : LINEAR);
}
-void Texture::set_mipmap_levels(unsigned l)
-{
- mipmap_levels = l;
- update_parameter(MIPMAP_LEVELS);
-}
-
void Texture::set_max_anisotropy(float a)
{
if(a<1.0f)
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)
}
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::bind_to(unsigned i, bool legacy) const
+void Texture::image(const Graphics::Image &img, bool srgb)
+{
+ image(img, 0, srgb);
+}
+
+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);
}
{
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
throw IO::file_not_found(fn);
img.load_io(*io);
- obj.image(img, srgb);
+ obj.image(img, 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, 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::wrap(TextureWrap w)
projects / libs / gl.git / blobdiff