Fixing build for arm64 Windows

.github/workflows/main.yml

@@ -13,8 +13,105 @@ on:
   # Allow manual trigger
   workflow_dispatch:
 
-
 jobs:
+  windows-arm64:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        options: [
+          {config: Debug, package: NO, tools: ON, docs: OFF},
+          {config: Release, package: YES, tools: ON, docs: ON}
+        ]
+    env:
+      # Skip downloading necessities for the load tests and source and golden
+      # images for the other tests since we can't run arm64 tests on the x64
+      # build host.
+      GIT_LFS_SKIP_SMUDGE: 1
+
+      BUILD_DIR: "build/build-batch-vs2022"
+      CONFIGURATION: "${{matrix.options.config}}"
+      CMAKE_GEN: "Visual Studio 17 2022" # Only VS version on Windows Server 2022
+      CMAKE_TOOLSET: "ClangCL"
+
+      PACKAGE: ${{matrix.options.package}}
+      FEATURE_TOOLS: ${{matrix.options.tools}}
+      FEATURE_DOC: ${{matrix.options.docs}}
+
+      PLATFORM: "arm64"
+      SUPPORT_SSE: OFF
+
+      # No tests on arm64 since the host is x64 and can't run the built tests
+      FEATURE_JNI: OFF # Not sure of the state of JNI on arm64 windows
+      FEATURE_TESTS: OFF
+      FEATURE_LOADTESTS: OFF
+
+      CERT_PK_PASS: ${{ secrets.CERT_PK_PASS }}
+      CERT_DC_SECRET: ${{ secrets.CERT_DC_SECRET }}
+      CERT_DC_SALT: ${{ secrets.CERT_DC_SALT }}
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        # Fetch all history to make sure tags are
+        # included (used for version creation)
+        fetch-depth: 0
+
+    # Need doxygen if docs are supposed to be built
+    # This has been observed to fail due to Sourceforge host failure
+    # Can't control that so please manually re-run if we time out here
+    - name: Install Doxygen
+      if: matrix.options.docs == 'ON'
+      uses: crazy-max/ghaction-chocolatey@v2
+      with:
+        args: install doxygen.install
+
+    - name: Install Certificate File Decryption Tool
+      if: matrix.options.package == 'YES'
+      run: iex ((New-Object Net.WebClient).DownloadString('https://raw.githubusercontent.com/appveyor/secure-file/master/install.ps1'))
+
+    - name: Import Certificate to Certificate Store
+      if: matrix.options.package == 'YES'
+      id: cert-import
+      run: |
+        if ($env:CERT_PK_PASS) {
+          $cert_file = "the_khronos_group_inc.p12"
+          appveyor-tools\secure-file -decrypt "${cert_file}.enc" -secret $env:CERT_DC_SECRET -salt $env:CERT_DC_SALT
+          certutil -p $env:CERT_PK_PASS -importpfx My $cert_file NoExport
+          rm $cert_file
+          echo "::set-output name=win_code_sign_identity::'The Khronos Group Inc'"
+          echo "::set-output name=win_cs_cert_search_machine_store::'ON'"
+        } else {
+          echo "::set-output name=win_code_sign_identity::''"
+          echo "::set-output name=win_cs_cert_search_machine_store::'OFF'"
+        }
+
+    - name: Build arm64 Windows
+      run: powershell ./ci_scripts/build_win.ps1
+      env:
+        WIN_CODE_SIGN_IDENTITY: ${{ steps.cert-import.outputs.win_code_sign_identity }}
+        WIN_CS_CERT_SEARCH_MACHINE_STORE: ${{ steps.cert-import.outputs.win_cs_cert_search_machine_store }}
+
+    - name: Get KTX version
+      if: matrix.options.package == 'YES'
+      id: ktx-version
+      run: |
+        $env:KTX_VERSION = Get-Content $env:BUILD_DIR/ktx.version
+        echo "::set-output name=ktx-version::$env:KTX_VERSION"
+
+    - name: Upload Artifact
+      if: matrix.options.package == 'YES'
+      uses: actions/upload-artifact@v2
+      with:
+        name: KTX-Software-${{ steps.ktx-version.outputs.ktx-version }}-Windows-arm64
+        path: ${{env.BUILD_DIR}}/KTX-Software-*.exe*
+
+    - name: Upload To Release
+      uses: softprops/action-gh-release@v1
+      if: (matrix.options.package == 'YES') && (github.event_name == 'release') && startsWith(github.ref, 'refs/tags/')
+      with:
+        files: ${{env.BUILD_DIR}}/KTX-Software-*.exe*
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   mingw:
     runs-on: windows-latest
@@ -31,8 +128,6 @@ jobs:
       run: cmake -B build -G "Ninja Multi-Config" -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++
     - name: Build Mingw x64 Debug
       run: cmake --build build --config Debug
-    - name: Build Mingw x64 RelWithDebInfo
-      run: cmake --build build --config RelWithDebInfo
     - name: Build Mingw x64 Release
       run: cmake --build build --config Release
 

CMakeLists.txt

@@ -278,6 +278,9 @@ macro(commom_lib_settings lib write)
                 -Wno-nested-anon-types
                 -Wno-gnu-anonymous-struct
             >
+            $<$<CXX_COMPILER_ID:GNU>:
+                -Wno-cast-function-type
+            >
             # not clang options
             $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:
                 -Wno-pedantic
@@ -524,9 +527,9 @@ PRIVATE
 #        "CMAKE_CXX_COMPILER_ID = ${CMAKE_CXX_COMPILER_ID} "
 #        "CMAKE_CXX_COMPILER_VERSION = ${CMAKE_CXX_COMPILER_VERSION}"
 #)
-if(MSVC)
+if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 # Currently no need to disable any warnings in basisu code. Rich fixed them.
-elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set_source_files_properties(
         # It's too much work to discriminate which files need which warnings
         # disabled.
@@ -543,7 +546,7 @@ elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
             PROPERTIES COMPILE_OPTIONS "-Wno-unused-but-set-variable"
         )
     endif()
-elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     if (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL "12.0.5")
         set_source_files_properties( lib/basisu/encoder/basisu_kernels_sse.cpp
             PROPERTIES COMPILE_OPTIONS "-Wno-unused-parameter;-Wno-deprecated-copy;-Wno-uninitialized-const-reference"
@@ -553,13 +556,22 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
             PROPERTIES COMPILE_OPTIONS "-Wno-unused-parameter"
         )
     endif()
-    if (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL "13.1")
+    if (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL "12.0.0")
+        # Primarily an issue on windows using clang/clangcl
+        # Lowest tested clang version was 12.0.0 and highest was 14.0.4
+        set_source_files_properties(
+            lib/basisu/zstd/zstd.c
+            PROPERTIES COMPILE_OPTIONS "-Wno-unused-function"
+        )
+    endif()
+    if (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL "13.0.0")
+        get_source_file_property(zstd_options lib/basisu/zstd/zstd.c COMPILE_OPTIONS)
         set_source_files_properties(
             # We haven't fixed zstd.c because the fix would have to be applied
             # every time the upstream script is used to create an updated
             # single file decoder.
             lib/basisu/zstd/zstd.c
-            PROPERTIES COMPILE_OPTIONS "-Wno-unused-but-set-variable"
+            PROPERTIES COMPILE_OPTIONS "${zstd_options};-Wno-unused-but-set-variable"
         )
     endif()
     if (${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER_EQUAL "15.0")
@@ -890,6 +902,13 @@ if( APPLE AND CMAKE_OSX_ARCHITECTURES )
     else()
         set(processor_name ${CMAKE_OSX_ARCHITECTURES})
     endif()
+elseif(CMAKE_CXX_COMPILER_ARCHITECTURE_ID)
+    # When targeting Windows arm64 CMAKE_SYSTEM_PROCESSOR will incorrectly 
+    # return AMD64.
+    # See: https://gitlab.kitware.com/cmake/cmake/-/issues/15170
+    # We assume that when building for Windows arm64 that we are using MSVC
+    # so we can detect the processor arch name with CMAKE_CXX_COMPILER_ARCHITECTURE_ID
+    set(processor_name ${CMAKE_CXX_COMPILER_ARCHITECTURE_ID})
 elseif( CMAKE_SYSTEM_PROCESSOR )
     set(processor_name ${CMAKE_SYSTEM_PROCESSOR})
 elseif( IOS )

ci_scripts/build_win.ps1

@@ -26,10 +26,12 @@ function Set-Config-Variable {
 $BUILD_DIR = Set-Config-Variable BUILD_DIR "build/build-batch-vs2019"
 $CONFIGURATION = Set-Config-Variable CONFIGURATION "Release"
 $CMAKE_GEN = Set-Config-Variable CMAKE_GEN "Visual Studio 16 2019"
+$CMAKE_TOOLSET = Set-Config-Variable CMAKE_TOOLSET ""
 $FEATURE_DOC = Set-Config-Variable FEATURE_DOC "OFF"
 $FEATURE_JNI = Set-Config-Variable FEATURE_JNI "OFF"
 $FEATURE_LOADTESTS = Set-Config-Variable FEATURE_LOADTESTS "OFF"
 $FEATURE_TOOLS = Set-Config-Variable FEATURE_TOOLS "ON"
+$FEATURE_TESTS = Set-Config-Variable FEATURE_TESTS "ON"
 $PLATFORM = Set-Config-Variable PLATFORM "x64"
 $PACKAGE = Set-Config-Variable PACKAGE "NO"
 $SUPPORT_SSE = Set-Config-Variable SUPPORT_SSE "ON"
@@ -41,13 +43,24 @@ $WIN_CS_CERT_SEARCH_MACHINE_STORE = Set-Config-Variable WIN_CS_CERT_SEARCH_MACHI
 
 if ($FEATURE_LOADTESTS -eq "ON")  { $need_gles_emulator=1 }
 
-echo "Build via $CMAKE_GEN dir: $build_dir Arch: $PLATFORM Config: $CONFIGURATION, FEATURE_LOADTESTS: $FEATURE_LOADTESTS, FEATURE_DOC: $FEATURE_DOC, FEATURE_JNI: $FEATURE_JNI, FEATURE_TOOLS: $FEATURE_TOOLS, SUPPORT_SSE: $SUPPORT_SSE, SUPPORT_OPENCL: $SUPPORT_OPENCL WIN_CODE_SIGN_IDENTITY: $WIN_CODE_SIGN_IDENTITY WIN_CS_CERT_SEARCH_MACHINE_STORE: $WIN_CS_CERT_SEARCH_MACHINE_STORE"
+echo "Build via $CMAKE_GEN dir: $BUILD_DIR Arch: $PLATFORM Toolset: $CMAKE_TOOLSET Config: $CONFIGURATION, FEATURE_LOADTESTS: $FEATURE_LOADTESTS, FEATURE_DOC: $FEATURE_DOC, FEATURE_JNI: $FEATURE_JNI, FEATURE_TOOLS: $FEATURE_TOOLS, FEATURE_TESTS: $FEATURE_TESTS, SUPPORT_SSE: $SUPPORT_SSE, SUPPORT_OPENCL: $SUPPORT_OPENCL WIN_CODE_SIGN_IDENTITY: $WIN_CODE_SIGN_IDENTITY WIN_CS_CERT_SEARCH_MACHINE_STORE: $WIN_CS_CERT_SEARCH_MACHINE_STORE"
 
-cmake . -G "$CMAKE_GEN" -A $PLATFORM -B $BUILD_DIR `
+if (($PACKAGE -eq "YES") -and ($FEATURE_TOOLS -eq "OFF")) {
+  echo "Error: Cannot package a configuration that does not build tools. Set FEATURE_TOOLS to ON or PACKAGE to NO"
+  exit 2
+}
+
+$TOOLSET_OPTION = ""
+if($CMAKE_TOOLSET){
+  $TOOLSET_OPTION = "-T $CMAKE_TOOLSET"
+}
+
+cmake . -G "$CMAKE_GEN" -A $PLATFORM $TOOLSET_OPTION -B $BUILD_DIR `
   -D KTX_FEATURE_DOC=$FEATURE_DOC `
   -D KTX_FEATURE_JNI=$FEATURE_JNI `
   -D KTX_FEATURE_LOADTEST_APPS=$FEATURE_LOADTESTS `
   -D KTX_FEATURE_TOOLS=$FEATURE_TOOLS `
+  -D KTX_FEATURE_TESTS=$FEATURE_TESTS `
   -D BASISU_SUPPORT_SSE=$SUPPORT_SSE `
   -D BASISU_SUPPORT_OPENCL=$SUPPORT_OPENCL `
   -D WIN_CODE_SIGN_IDENTITY=$WIN_CODE_SIGN_IDENTITY `
@@ -58,11 +71,23 @@ pushd $BUILD_DIR
 try {
   #git status
   cmake --build . --config $CONFIGURATION
+  # Return an error code if cmake fails
+  if(!$?){
+    popd
+    exit 1
+  }
+
   #git status
   if ($PACKAGE -eq "YES") {
     cmake --build . --config $CONFIGURATION --target PACKAGE
+    # Return an error code if cmake fails
+    if(!$?){
+      popd
+      exit 1
+    }
   }
   echo "Done building."
-} finally {
-  popd
+}
+finally {
+ popd
 }

cmake/cputypetest.cmake

@@ -77,10 +77,10 @@ function(set_target_processor_type out)
         set(${out} x86_64 PARENT_SCOPE)
 
     else()
-        if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-            if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM")
+        if(MSVC) # MSVC is true for all msvc-style compilers, including clang-cl
+            if("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "arm")
                 set(processor "arm")
-            elseif("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64")
+            elseif("${CMAKE_GENERATOR_PLATFORM}" STREQUAL "ARM64" OR "${CMAKE_GENERATOR_PLATFORM}" STREQUAL "arm64")
                 set(processor "arm64")
             else()
                 set(C_PREPROCESS ${CMAKE_C_COMPILER} /EP /nologo)

lib/etcdec.cxx

@@ -173,11 +173,13 @@ submitted to the exclusive jurisdiction of the Swedish Courts.
 // the source of the functions or the compiled binary code.
 #if defined(_MSC_VER)
   #pragma warning(push)
-  #pragma warning(disable: 4100 4244 )
-#elif __clang__
+  #pragma warning(disable: 4100 4244)
+#endif
+// clang-cl defines both _MSC_VER and __clang__
+#if __clang__
   #pragma clang diagnostic push
   #pragma clang diagnostic ignored "-Wunused-parameter"
-  #if __clang_major__ > 13 || (__clang_major__ == 13 && __clang_minor__ >= 1)
+  #if __has_warning("-Wunused-but-set-variable")
     #pragma clang diagnostic ignored "-Wunused-but-set-variable"
   #endif
 #elif __GNUC__
@@ -1862,6 +1864,9 @@ void decompressBlockAlpha16bit(uint8* data, uint8* img, int width, int height, i
 // Reenable warnings disabled at the top of this file.
 #if defined(_MSC_VER)
 #pragma warning(pop)
-#else
+#endif
+#if __clang__
+#pragma clang diagnostic pop
+#elif __GNUC__
 #pragma GCC diagnostic pop
 #endif

lib/gl_format.h

@@ -91,7 +91,7 @@ MODIFICATIONS for use in libktx
 #include "formatsize.h"
 #include "vkformat_enum.h"
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(__MINGW32__)
 #define NOMINMAX
 #ifndef __cplusplus
 #undef inline

lib/vk_funcs.c

@@ -77,8 +77,7 @@ static HMODULE
 ktxGetVulkanModuleHandle()
 {
     HMODULE module = NULL;
-    BOOL found;
-    found = GetModuleHandleExA(
+    GetModuleHandleExA(
 		0,
 		VULKANLIB,
 		&module

tests/transcodetests/CMakeLists.txt

@@ -43,6 +43,14 @@ if(WIN32)
         $<$<STREQUAL:"${BASISU_CBIND_LIBTYPE}","STATIC">:KHRONOS_STATIC>
     )
 
+    # Disable some known warnings in the transcoder
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        set_source_files_properties(
+            ${PROJECT_SOURCE_DIR}/lib/basisu/transcoder/basisu_transcoder.cpp
+            PROPERTIES COMPILE_OPTIONS "-Wno-sign-compare;-Wno-unused-function;-Wno-unused-variable;-Wno-class-memaccess;-Wno-maybe-uninitialized"
+        )
+    endif()
+
     # The Windows ktx.dll does not export needed symbols from
     # basisu_transcoder.cpp. This is a workaround to get it linking.
     add_library(obj_tmp_basisu OBJECT