[cmake] Fix CI package cache keys

CMakeModules/CPMUtil.cmake

@@ -370,6 +370,7 @@ function(AddPackage)
 
         URL
 
+        KEY
         SOURCE_SUBDIR
         BUNDLED_PACKAGE
         FORCE_BUNDLED_PACKAGE
@@ -434,7 +435,9 @@ function(AddPackage)
 
     cpm_utils_message(DEBUG ${PKG_ARGS_NAME} "Download URL is ${pkg_url}")
 
-    if(DEFINED PKG_ARGS_SHA)
+    if(DEFINED PKG_ARGS_KEY AND NOT PKG_ARGS_KEY STREQUAL "")
+        set(pkg_key ${PKG_ARGS_KEY})
+    elseif(DEFINED PKG_ARGS_SHA)
         string(SUBSTRING ${PKG_ARGS_SHA} 0 4 pkg_key)
     elseif(DEFINED PKG_ARGS_VERSION)
         set(pkg_key ${PKG_ARGS_VERSION})
@@ -717,6 +720,7 @@ function(AddCIPackage)
             TAG "v${ARTIFACT_VERSION}"
             MIN_VERSION ${ARTIFACT_VERSION}
             ARTIFACT ${ARTIFACT}
+            KEY "${pkgname}-${ARTIFACT_VERSION}"
             HASH ${sha512sum_hash}
             FORCE_BUNDLED_PACKAGE ON
             ${EXTRA_ARGS})

src/common/dynamic_library.cpp

@@ -4,8 +4,12 @@
 // SPDX-FileCopyrightText: 2019 Dolphin Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include <cstring>
 #include <string>
+
+#ifndef _WIN32
+#include <cstring>
+#endif
+
 #include <utility>
 
 #include <fmt/ranges.h>

src/video_core/shader_environment.cpp

@@ -255,7 +255,8 @@ std::optional<u64> GenericEnvironment::TryFindSize() {
     static constexpr u64 SELF_BRANCH_A = 0xE2400FFFFF87000FULL;
     static constexpr u64 SELF_BRANCH_B = 0xE2400FFFFF07000FULL;
 
-    static constexpr u64 EXIT_VALUE = 0xE30000000007000FULL;
+    static constexpr u64 MESA_EXIT_MASK = 0xFFF00000000F001FULL;
+    static constexpr u64 MESA_EXIT_VALUE = (0xE30ULL << 52) | (0x7ULL << 16) | 0xFULL;
 
     code.resize(MAXIMUM_SIZE / INST_SIZE);
 
@@ -270,7 +271,7 @@ std::optional<u64> GenericEnvironment::TryFindSize() {
             if (inst == SELF_BRANCH_A || inst == SELF_BRANCH_B) {
                 return offset + index;
             }
-            if (!is_proprietary_driver && inst == EXIT_VALUE) {
+            if ((inst & MESA_EXIT_MASK) == MESA_EXIT_VALUE) {
                 return offset + index + INST_SIZE;
             }
         }