Always use swizzle to implement luminance formats

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

diff --git a/source/texture.cpp b/source/texture.cpp
index 90e3bb17f11de1c318f6670a28ce61a17a13a88b..772f2d16e8b578fac2fbadbb6ef0f3da6f6f8954 100644 (file)
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -53,26 +53,28 @@ DataType Texture::get_alloc_type(PixelFormat fmt)
 
 void Texture::set_internal_format(PixelFormat fmt)
 {
-       swizzle = NO_SWIZZLE;
-       if(ARB_texture_rg && ARB_texture_swizzle)
+       FormatSwizzle swiz = NO_SWIZZLE;
+       switch(get_base_pixelformat(fmt))
        {
-               if(fmt==LUMINANCE)
-               {
-                       fmt = RED;
-                       swizzle = R_TO_LUMINANCE;
-               }
-               else if(fmt==LUMINANCE_ALPHA)
-               {
-                       fmt = RG;
-                       swizzle = RG_TO_LUMINANCE_ALPHA;
-               }
+       case LUMINANCE:
+               fmt = RED;
+               swiz = R_TO_LUMINANCE;
+               break;
+       case LUMINANCE_ALPHA:
+               fmt = RG;
+               swiz = RG_TO_LUMINANCE_ALPHA;
+               break;
+       default:;
        }
 
        if(!get_component_size(fmt) && OES_required_internalformat)
                fmt = get_default_sized_pixelformat(fmt);
 
        require_pixelformat(fmt);
+       if(swiz!=NO_SWIZZLE)
+               static Require _req(ARB_texture_swizzle);
        ifmt = fmt;
+       swizzle = swiz;
 }
 
 PixelFormat Texture::get_upload_format(PixelFormat fmt) const