Deprecate the mipmap_levels parameter in Texture

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

diff --git a/source/texture.cpp b/source/texture.cpp
index a7e4898c1edae7d73de8efe9bf425dbb69ccc569..401cb968578d9d9eb7ac7e433869929d3f221e2f 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -63,7 +63,6 @@ Texture::Texture(GLenum t, ResourceManager *m):
        ifmt(RGB),
        min_filter(NEAREST_MIPMAP_LINEAR),
        mag_filter(LINEAR),
-       mipmap_levels(0),
        max_anisotropy(1.0f),
        wrap_s(REPEAT),
        wrap_t(REPEAT),
@@ -97,24 +96,24 @@ DataType Texture::get_alloc_type(PixelFormat fmt)
 
 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)
+               if(fmt==LUMINANCE)
                {
-                       fmt = R8;
+                       fmt = RED;
                        swiz = R_TO_LUMINANCE;
                }
-               else if(fmt==LUMINANCE8_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;
@@ -132,6 +131,12 @@ PixelFormat Texture::get_upload_format(PixelFormat fmt) const
 
 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);
@@ -177,8 +182,6 @@ void Texture::update_parameter(int mask) const
                                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
@@ -215,12 +218,6 @@ void Texture::set_filter(TextureFilter f)
        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)
@@ -302,11 +299,21 @@ void Texture::set_compare_func(Predicate 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) const
@@ -380,6 +387,7 @@ Texture::Loader::Loader(Texture &t, Collection &c):
 
 void Texture::Loader::init()
 {
+       levels = 0;
        if(Resources *res = dynamic_cast<Resources *>(coll))
                srgb = res->get_srgb_conversion();
        else
@@ -407,7 +415,7 @@ void Texture::Loader::external_image(const string &fn)
                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)
@@ -426,7 +434,7 @@ 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)
@@ -446,7 +454,7 @@ void Texture::Loader::min_filter(TextureFilter f)
 
 void Texture::Loader::mipmap_levels(unsigned l)
 {
-       obj.set_mipmap_levels(l);
+       levels = l;
 }
 
 void Texture::Loader::wrap(TextureWrap w)