Astc normal maps

lib/astc_encode.cpp

@@ -598,6 +598,7 @@ ktxTexture2_CompressAstcEx(ktxTexture2* This, ktxAstcParams* params) {
     astcenc_profile profile{ASTCENC_PRF_LDR_SRGB};
 
     astcenc_swizzle swizzle{ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A};
+    const astcenc_swizzle normal_swizzle{ASTCENC_SWZ_R, ASTCENC_SWZ_R, ASTCENC_SWZ_R, ASTCENC_SWZ_G};
 
     uint32_t        block_size_x{6};
     uint32_t        block_size_y{6};
@@ -609,7 +610,7 @@ ktxTexture2_CompressAstcEx(ktxTexture2* This, ktxAstcParams* params) {
                         block_size_x, block_size_y, block_size_z);
     quality = astcQuality(params->qualityLevel);
     profile = astcEncoderAction(*params, BDB);
-    swizzle = astcSwizzle(*params);
+    swizzle = params->normalMap ? normal_swizzle : astcSwizzle(*params);
 
     astcenc_config   astc_config;
     astcenc_context *astc_context;

tools/toktx/toktx.cc

@@ -1357,11 +1357,6 @@ toktxApp::main(int argc, _TCHAR *argv[])
                 for (i = 0; i < 4; i++) {
                      bopts.inputSwizzle[i] = options.inputSwizzle[i];
                 }
-            } else if (options.normalMode) {
-                string normalSwizzle = "rrrg";
-                for (i = 0; i < 4; i++) {
-                     bopts.inputSwizzle[i] = normalSwizzle[i];
-                }
             } else if (defaultSwizzle.size()) {
                  for (i = 0; i < 4; i++) {
                      bopts.inputSwizzle[i] = defaultSwizzle[i];
@@ -1388,11 +1383,6 @@ toktxApp::main(int argc, _TCHAR *argv[])
                 for (i = 0; i < options.inputSwizzle.size(); i++) {
                      astcopts.inputSwizzle[i] = options.inputSwizzle[i];
                 }
-            } else if (options.normalMode) {
-                string normalSwizzle = "rrrg";
-                for (i = 0; i < 4; i++) {
-                     astcopts.inputSwizzle[i] = normalSwizzle[i];
-                }
             } else if (defaultSwizzle.size()) {
                  for (i = 0; i < options.inputSwizzle.size(); i++) {
                      astcopts.inputSwizzle[i] = defaultSwizzle[i];