Fix newly emerged warning from clang (#608)

and a warning from a recent code change in toktx.cc.

The new clang warning has appeared, without a bump in the LLVM version number, because Emscripten releases pull the top of tree LLVM and our CI gets the latest Emscripten release. LLVM is in the final throes of developing their 15.0.0 release. 

As there is no version number change we've had to use the `__has_warning` pre-processor directive and thus modify the offending BasisU file.

Note that MS VC++ also has `__has_warning` but with a different syntax so this fix uses the directive only when `__clang__` is defined.

Author: MarkCallow

lib/basisu/transcoder/basisu_containers.h

@@ -10,6 +10,10 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-value"
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
+#elif __clang__
+#if __has_warning("-Wdeprecated-builtins")
+#pragma clang diagnostic ignored "-Wdeprecated-builtins"
+#endif
 #endif
 
 #if defined(__linux__) && !defined(ANDROID)

tools/toktx/toktx.cc

@@ -647,9 +647,6 @@ toktxApp::main(int argc, _TCHAR *argv[])
     int exitCode = 0;
     unsigned int componentCount = 1, faceSlice, level, layer, levelCount = 1;
     unsigned int levelWidth=0, levelHeight=0, levelDepth=0;
-    // These initializations are to avoid compiler warnings.
-    khr_df_transfer_e chosenOETF = KHR_DF_TRANSFER_UNSPECIFIED;
-    khr_df_primaries_e chosenPrimaries = KHR_DF_PRIMARIES_UNSPECIFIED;
     struct _imageAttribs {
         khr_df_transfer_e oetf;
         khr_df_primaries_e primaries;
@@ -947,8 +944,6 @@ toktxApp::main(int argc, _TCHAR *argv[])
 
         if (i == 0) {
             // First file.
-            chosenOETF = image->getOetf();
-            chosenPrimaries = image->getPrimaries();
 
             if (image->getColortype() < Image::colortype_e::eR) {  // Luminance type?
                 if (image->getColortype() == Image::colortype_e::eLuminance) {
@@ -1290,9 +1285,9 @@ toktxApp::main(int argc, _TCHAR *argv[])
                                   swizzle.c_str());
         }
 
-        if (options.ktx2 && chosenPrimaries != KHR_DF_PRIMARIES_BT709) {
+        if (options.ktx2 && expectedAttribs.primaries != KHR_DF_PRIMARIES_BT709) {
             KHR_DFDSETVAL(((ktxTexture2*)texture)->pDfd + 1, PRIMARIES,
-                          chosenPrimaries);
+                          expectedAttribs.primaries);
         }
     }