diff --git a/gli/core/gl.inl b/gli/core/gl.inl
index 2f76a82e9..779ade579 100644
--- a/gli/core/gl.inl
+++ b/gli/core/gl.inl
@@ -329,13 +329,11 @@ namespace detail
 
 		gl::format_desc const& FormatDesc = this->FormatDesc[Format - FORMAT_FIRST];
 
-		bool const IsExternalBGRA = ((FormatDesc.Properties & detail::FORMAT_PROPERTY_BGRA_FORMAT_BIT) && !has_swizzle(this->Profile)) || (FormatDesc.Properties & detail::FORMAT_PROPERTY_BGRA_TYPE_BIT);
-
 		gl::format FormatGL;
 		FormatGL.Internal = FormatDesc.Internal;
 		FormatGL.External = FormatDesc.External;
 		FormatGL.Type = FormatDesc.Type;
-		FormatGL.Swizzles = detail::translate(IsExternalBGRA ? gli::swizzles(Swizzles.b, Swizzles.g, Swizzles.r, Swizzles.a) : Swizzles);
+		FormatGL.Swizzles = this->compute_swizzle(FormatDesc, Swizzles);
 		return FormatGL;
 	}
 
@@ -356,4 +354,13 @@ namespace detail
 		return static_cast<gli::format>(FORMAT_INVALID);
 	}
 
+	inline gl::swizzles gl::compute_swizzle(format_desc const& FormatDesc, gli::swizzles const& Swizzles) const
+	{
+		if (!this->has_swizzle(this->Profile))
+			return swizzles(gl::SWIZZLE_RED, gl::SWIZZLE_GREEN, gl::SWIZZLE_BLUE, gl::SWIZZLE_ALPHA);
+
+		bool const IsExternalBGRA = ((FormatDesc.Properties & detail::FORMAT_PROPERTY_BGRA_FORMAT_BIT) && !has_swizzle(this->Profile)) || (FormatDesc.Properties & detail::FORMAT_PROPERTY_BGRA_TYPE_BIT);
+
+		return detail::translate(IsExternalBGRA ? gli::swizzles(Swizzles.b, Swizzles.g, Swizzles.r, Swizzles.a) : Swizzles);
+	}
 }//namespace gli
diff --git a/gli/gl.hpp b/gli/gl.hpp
index 7180e2a91..82584e55d 100644
--- a/gli/gl.hpp
+++ b/gli/gl.hpp
@@ -350,11 +350,6 @@ namespace gli
 		gli::format find(internal_format InternalFormat, external_format ExternalFormat, type_format Type);
 
 	private:
-		bool has_swizzle(profile Profile) const
-		{
-			return Profile == PROFILE_ES30 || Profile == PROFILE_GL33;
-		}
-
 		struct format_desc
 		{
 			internal_format Internal;
@@ -363,6 +358,13 @@ namespace gli
 			unsigned int Properties;
 		};
 
+		bool has_swizzle(profile Profile) const
+		{
+			return Profile == PROFILE_ES30 || Profile == PROFILE_GL33;
+		}
+
+		gl::swizzles compute_swizzle(format_desc const& FormatDesc, gli::swizzles const& Swizzle) const;
+
 		std::array<format_desc, FORMAT_COUNT> FormatDesc;
 		profile Profile;
 	};
diff --git a/test/core/gl.cpp b/test/core/gl.cpp
index c77a6e417..575a131a3 100644
--- a/test/core/gl.cpp
+++ b/test/core/gl.cpp
@@ -15,7 +15,8 @@ namespace ktx
 		Error += FormatA.Internal == gli::gl::INTERNAL_RGB8_UNORM ? 0 : 1;
 		Error += FormatA.External == gli::gl::EXTERNAL_RGB ? 0 : 1;
 		Error += FormatA.Type == gli::gl::TYPE_U8 ? 0 : 1;
-		Error += FormatA.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ONE) ? 0 : 1;
+		// Swizzle is not supported by KTX, so we always return the constant default swizzle
+		Error += FormatA.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ALPHA) ? 0 : 1;
 
 		gli::texture2d TextureB(gli::FORMAT_BGR8_UNORM_PACK8, gli::texture2d::extent_type(2), 1, gli::texture2d::swizzles_type(gli::SWIZZLE_RED, gli::SWIZZLE_GREEN, gli::SWIZZLE_BLUE, gli::SWIZZLE_ALPHA));
 		gli::gl::format FormatB = GL.translate(TextureB.format(), TextureB.swizzles());
@@ -23,7 +24,8 @@ namespace ktx
 		Error += FormatB.Internal == gli::gl::INTERNAL_RGB8_UNORM ? 0 : 1;
 		Error += FormatB.External == gli::gl::EXTERNAL_BGR ? 0 : 1;
 		Error += FormatB.Type == gli::gl::TYPE_U8 ? 0 : 1;
-		Error += FormatB.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ONE) ? 0 : 1;
+		// Swizzle is not supported by KTX, so we always return the constant default swizzle
+		Error += FormatB.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ALPHA) ? 0 : 1;
 
 		return Error;
 	}
@@ -43,7 +45,8 @@ namespace gl32
 		Error += FormatA.Internal == gli::gl::INTERNAL_RGB8_UNORM ? 0 : 1;
 		Error += FormatA.External == gli::gl::EXTERNAL_RGB ? 0 : 1;
 		Error += FormatA.Type == gli::gl::TYPE_U8 ? 0 : 1;
-		Error += FormatA.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ONE) ? 0 : 1;
+		// Swizzle is not supported by OpenGL 3.2, so we always return the constant default swizzle
+		Error += FormatA.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ALPHA) ? 0 : 1;
 
 		gli::texture2d TextureB(gli::FORMAT_BGR8_UNORM_PACK8, gli::texture2d::extent_type(2), 1, gli::texture2d::swizzles_type(gli::SWIZZLE_RED, gli::SWIZZLE_GREEN, gli::SWIZZLE_BLUE, gli::SWIZZLE_ALPHA));
 		gli::gl::format FormatB = GL.translate(TextureB.format(), TextureB.swizzles());
@@ -51,7 +54,8 @@ namespace gl32
 		Error += FormatB.Internal == gli::gl::INTERNAL_RGB8_UNORM ? 0 : 1;
 		Error += FormatB.External == gli::gl::EXTERNAL_BGR ? 0 : 1;
 		Error += FormatB.Type == gli::gl::TYPE_U8 ? 0 : 1;
-		Error += FormatB.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ONE) ? 0 : 1;
+		// Swizzle is not supported by OpenGL 3.2, so we always return the constant default swizzle
+		Error += FormatB.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ALPHA) ? 0 : 1;
 
 		{
 			gli::texture2d TextureC(gli::FORMAT_R5G6B5_UNORM_PACK16, gli::texture2d::extent_type(2), 1, gli::texture2d::swizzles_type(gli::SWIZZLE_RED, gli::SWIZZLE_GREEN, gli::SWIZZLE_BLUE, gli::SWIZZLE_ALPHA));
@@ -60,7 +64,8 @@ namespace gl32
 			Error += FormatC.Internal == gli::gl::INTERNAL_R5G6B5 ? 0 : 1;
 			Error += FormatC.External == gli::gl::EXTERNAL_RGB ? 0 : 1;
 			Error += FormatC.Type == gli::gl::TYPE_UINT16_R5G6B5_REV ? 0 : 1;
-			Error += FormatC.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ONE) ? 0 : 1;
+			// Swizzle is not supported by OpenGL 3.2, so we always return the constant default swizzle
+			Error += FormatC.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ALPHA) ? 0 : 1;
 
 			gli::format FormatD2 = GL.find(FormatC.Internal, FormatC.External, FormatC.Type);
 			Error += FormatD2 == TextureC.format() ? 0 : 1;
@@ -73,7 +78,8 @@ namespace gl32
 			Error += FormatD.Internal == gli::gl::INTERNAL_R5G6B5 ? 0 : 1;
 			Error += FormatD.External == gli::gl::EXTERNAL_RGB ? 0 : 1;
 			Error += FormatD.Type == gli::gl::TYPE_UINT16_R5G6B5 ? 0 : 1;
-			Error += FormatD.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ONE) ? 0 : 1;
+			// Swizzle is not supported by OpenGL 3.2, so we always return the constant default swizzle
+			Error += FormatD.Swizzles == gli::gl::swizzles(gli::gl::SWIZZLE_RED, gli::gl::SWIZZLE_GREEN, gli::gl::SWIZZLE_BLUE, gli::gl::SWIZZLE_ALPHA) ? 0 : 1;
 
 			gli::format FormatD2 = GL.find(FormatD.Internal, FormatD.External, FormatD.Type);
 			Error += FormatD2 == TextureD.format() ? 0 : 1;