2026-09-17 15:57:17

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/common/CMakeLists.txt

@@ -36,7 +36,6 @@ add_library(
     cityhash.h
     common_funcs.h
     common_types.h
-    concepts.h
     container_hash.h
     demangle.cpp
     demangle.h

src/common/concepts.h

@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <iterator>
-#include <type_traits>
-
-namespace Common {
-
-// Check if type satisfies the ContiguousContainer named requirement.
-template <typename T>
-concept IsContiguousContainer = std::contiguous_iterator<typename T::iterator>;
-
-} // namespace Common

src/common/fixed_point.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2015 Evan Teran
@@ -15,8 +15,6 @@
 #include <ostream>
 #include <type_traits>
 
-#include <common/concepts.h>
-
 namespace Common {
 
 // No equivalent for "std::arithmetic" in the stdlib

src/common/fs/file.h

@@ -6,12 +6,12 @@
 
 #pragma once
 
+#include <concepts>
 #include <cstdio>
 #include <filesystem>
 #include <span>
 #include <type_traits>
 
-#include "common/concepts.h"
 #include "common/fs/fs_types.h"
 #include "common/fs/fs_util.h"
 
@@ -212,7 +212,7 @@ public:
 
     /**
      * Helper function which deduces the value type of a contiguous STL container used in ReadSpan.
-     * If T is not a contiguous container as defined by the concept IsContiguousContainer, this
+     * If T is not a contiguous container as defined by the concept, this
      * calls ReadObject and T must be a trivially copyable object.
      *
      * See ReadSpan for more details if T is a contiguous container.
@@ -226,7 +226,7 @@ public:
      */
     template <typename T>
     [[nodiscard]] size_t Read(T& data) const {
-        if constexpr (IsContiguousContainer<T>) {
+        if constexpr (std::contiguous_iterator<typename T::iterator>) {
             using ContiguousType = typename T::value_type;
             static_assert(std::is_trivially_copyable_v<ContiguousType>,
                           "Data type must be trivially copyable.");
@@ -238,7 +238,7 @@ public:
 
     /**
      * Helper function which deduces the value type of a contiguous STL container used in WriteSpan.
-     * If T is not a contiguous STL container as defined by the concept IsContiguousContainer, this
+     * If T is not a contiguous STL container as defined by the concept, this
      * calls WriteObject and T must be a trivially copyable object.
      *
      * See WriteSpan for more details if T is a contiguous container.
@@ -252,7 +252,7 @@ public:
      */
     template <typename T>
     [[nodiscard]] size_t Write(const T& data) const {
-        if constexpr (IsContiguousContainer<T>) {
+        if constexpr (std::contiguous_iterator<typename T::iterator>) {
             using ContiguousType = typename T::value_type;
             static_assert(std::is_trivially_copyable_v<ContiguousType>,
                           "Data type must be trivially copyable.");

src/common/settings.h

@@ -612,7 +612,8 @@ struct Values {
                                                   Specialization::Default,
                                                   true,
                                                   true};
-    // Only effects android
+
+#ifdef __ANDROID__
     SwitchableSetting<bool> use_optimized_vertex_buffers{linkage,
                                                  false,
                                                  "use_optimized_vertex_buffers",
@@ -620,6 +621,7 @@ struct Values {
                                                  Specialization::Default,
                                                  true,
                                                  true};
+#endif
 
     // Renderer Hacks //
     SwitchableSetting<GpuClock> gpu_clock{linkage,
@@ -686,7 +688,9 @@ struct Values {
                                                   Category::RendererHacks};
 
     SwitchableSetting<ExtendedDynamicState> dyna_state{linkage,
-#if defined(__ANDROID__) || defined(__APPLE__)
+#if defined(__ANDROID__)
+                                           ExtendedDynamicState::Disabled,
+#elif defined(__APPLE__)
                                            ExtendedDynamicState::Disabled,
 #else
                                            ExtendedDynamicState::EDS2,
@@ -719,9 +723,11 @@ struct Values {
                                                     linkage, false, "disable_shader_loop_safety_checks", Category::RendererDebug};
     Setting<bool> enable_renderdoc_hotkey{linkage, false, "renderdoc_hotkey",
                                           Category::RendererDebug};
+#if defined(__ANDROID__) && defined(ARCHITECTURE_arm64)
     // Debug override for automatic BCn patching detection
     Setting<bool> patch_old_qcom_drivers{linkage, false, "patch_old_qcom_drivers",
                                          Category::RendererDebug};
+#endif
     SwitchableSetting<bool> disable_buffer_reorder{linkage, false, "disable_buffer_reorder",
                                          Category::RendererDebug,
                                          Specialization::Default,

src/core/hle/service/hle_ipc.h

@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <concepts>
 #include <array>
 #include <functional>
 #include <memory>
@@ -18,7 +19,6 @@
 
 #include "common/assert.h"
 #include "common/common_types.h"
-#include "common/concepts.h"
 #include "common/swap.h"
 #include "core/hle/ipc.h"
 #include "core/hle/kernel/k_handle_table.h"
@@ -292,18 +292,20 @@ public:
      * @param data         The container/data to write into a buffer.
      * @param buffer_index The buffer in particular to write to.
      */
-    template <typename T, typename = std::enable_if_t<!std::is_pointer_v<T>>>
+    template <typename T>
+        requires (!std::is_pointer_v<T>
+            && std::contiguous_iterator<typename T::iterator>)
     std::size_t WriteBuffer(const T& data, std::size_t buffer_index = 0) const {
-        if constexpr (Common::IsContiguousContainer<T>) {
-            using ContiguousType = typename T::value_type;
-            static_assert(std::is_trivially_copyable_v<ContiguousType>,
-                          "Container to WriteBuffer must contain trivially copyable objects");
-            return WriteBuffer(std::data(data), std::size(data) * sizeof(ContiguousType),
-                               buffer_index);
-        } else {
-            static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable");
-            return WriteBuffer(&data, sizeof(T), buffer_index);
-        }
+        using C = typename T::value_type;
+        static_assert(std::is_trivially_copyable_v<C>, "Container to WriteBuffer must contain trivially copyable objects");
+        return WriteBuffer(std::data(data), std::size(data) * sizeof(C), buffer_index);
+    }
+    template <typename T>
+        requires (!std::is_pointer_v<T>
+            && !std::contiguous_iterator<typename T::iterator>)
+    std::size_t WriteBuffer(const T& data, std::size_t buffer_index = 0) const {
+        static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable");
+        return WriteBuffer(&data, sizeof(T), buffer_index);
     }
 
     /// Helper function to get the size of the input buffer

src/core/hle/service/nvdrv/devices/ioctl_serialization.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -9,7 +9,6 @@
 #include <span>
 #include <vector>
 
-#include "common/concepts.h"
 #include "core/hle/service/nvdrv/devices/nvdevice.h"
 
 namespace Service::Nvidia::Devices {

src/core/loader/loader.cpp

@@ -10,7 +10,6 @@
 #include <string>
 #include <concepts>
 #include <algorithm>
-#include "common/concepts.h"
 #include "common/fs/path_util.h"
 #include "common/logging.h"
 #include "common/string_util.h"