Simplify applying texture swizzling

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

diff --git a/source/texture.cpp b/source/texture.cpp
index 7983cfb50e5c4272f76c2ceb9e1c3a5628639635..90e3bb17f11de1c318f6670a28ce61a17a13a88b 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -25,8 +25,8 @@ Texture::Texture(GLenum t, ResourceManager *m):
        id(0),
        target(t),
        ifmt(RGB),
+       swizzle(NO_SWIZZLE),
        auto_gen_mipmap(false),
-       dirty_params(0),
        default_sampler(*this)
 {
        if(m)
@@ -53,18 +53,18 @@ DataType Texture::get_alloc_type(PixelFormat fmt)
 
 void Texture::set_internal_format(PixelFormat fmt)
 {
-       FormatSwizzle swiz = NO_SWIZZLE;
+       swizzle = NO_SWIZZLE;
        if(ARB_texture_rg && ARB_texture_swizzle)
        {
                if(fmt==LUMINANCE)
                {
                        fmt = RED;
-                       swiz = R_TO_LUMINANCE;
+                       swizzle = R_TO_LUMINANCE;
                }
                else if(fmt==LUMINANCE_ALPHA)
                {
                        fmt = RG;
-                       swiz = RG_TO_LUMINANCE_ALPHA;
+                       swizzle = RG_TO_LUMINANCE_ALPHA;
                }
        }
 
@@ -73,9 +73,6 @@ void Texture::set_internal_format(PixelFormat fmt)
 
        require_pixelformat(fmt);
        ifmt = fmt;
-       swizzle = swiz;
-       if(swizzle)
-               update_parameter(FORMAT_SWIZZLE);
 }
 
 PixelFormat Texture::get_upload_format(PixelFormat fmt) const
@@ -86,42 +83,24 @@ PixelFormat Texture::get_upload_format(PixelFormat fmt) const
                return fmt;
 }
 
-void Texture::update_parameter(int mask) const
+void Texture::apply_swizzle()
 {
-       if(!id)
-       {
-               dirty_params |= mask;
+       if(swizzle==NO_SWIZZLE)
                return;
-       }
 
-       if(!ARB_direct_state_access && TexUnit::current().get_texture()!=this)
+       if(get_gl_api()==OPENGL_ES2)
        {
-               TexUnit *unit = TexUnit::find_unit(this);
-               if(!unit)
-               {
-                       dirty_params |= mask;
-                       return;
-               }
-
-               unit->bind();
+               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&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);
        }
 }
 
@@ -133,14 +112,6 @@ 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)
 {
        default_sampler.set_min_filter(f);
@@ -266,12 +237,6 @@ void Texture::bind_to(unsigned i) const
                        glBindTexture(target, id);
                }
 
-               if(dirty_params)
-               {
-                       update_parameter(dirty_params);
-                       dirty_params = 0;
-               }
-
                default_sampler.bind_to(i);
        }
 }