remove evil hacks: TODO: patch in later pr

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

CMakeLists.txt

@@ -23,20 +23,8 @@ include(CMakeDependentOption)
 include(CTest)
 include(CPMUtil)
 
-if (NOT DEFINED ARCHITECTURE)
-    message(FATAL_ERROR "Architecture didn't make it out of scope, did you delete DetectArchitecture.cmake?")
-endif()
-
-# Needed for FFmpeg w/ VAAPI and DRM
-if (OPENBSD)
-    # OpenBSD 7.8 broke libcxx when upgrading, so we must define the PSTL backend manually
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include -D_LIBCPP_PSTL_BACKEND_SERIAL=1")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R6/include -D_LIBCPP_PSTL_BACKEND_SERIAL=1")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R6/lib")
-elseif (NETBSD)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include -I${CMAKE_SYSROOT}/usr/pkg/include/c++/v1")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${CMAKE_SYSROOT}/usr/X11R7/include -I${CMAKE_SYSROOT}/usr/pkg/include/c++/v1")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L${CMAKE_SYSROOT}/usr/X11R7/lib")
+if (CXX_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "14.0")
+    message(FATAL_ERROR "GCC versions older than 14.0 are not supported. Update your system, or use clang/clang++ instead.")
 endif()
 
 # NetBSD: Fun for the whole family!
@@ -620,7 +608,7 @@ if (ENABLE_QT)
 
     # Best practice is to ask for all components at once, so they are from the same version
     set(YUZU_QT_COMPONENTS Core Widgets Charts Concurrent Gui)
-    if (LINUX OR FREEBSD)
+    if (NOT WIN32 AND NOT APPLE)
         list(APPEND YUZU_QT_COMPONENTS DBus)
         # yes Qt, we get it
         set(QT_NO_PRIVATE_MODULE_WARNING ON)

docs/Caveats.md

@@ -71,7 +71,7 @@ export LIBGL_ALWAYS_SOFTWARE=1
 
 Install `developer/gcc14` on OmniOS using pkgsrc.
 
-Since so many dependencies are missing on `OmniOS`, you may wish to use `-DCPMUTIL_FORCE_BUNDLED=ON`
+Since so many dependencies are missing on `OmniOS`, you may wish to use `-DCPMUTIL_FORCE_BUNDLED=ON` and `-DYUZU_USE_BUNDLED_OPENSSL=OFF`.
 
 For OmniOS you are required to build glslang yourself:
 ```sh
@@ -92,6 +92,8 @@ You may also need to install `gmake` in order to properly build FFmpeg, this is
 
 If it wasn't obvious already, you require a X11 server to properly run the emulator within OmniOS, [this guide](https://web.archive.org/web/20260424200928/https://geekblood.wordpress.com/2017/10/26/installing-x11-and-a-desktop-environment-on-omnios/) is a great starting point for that, the links to pkgsrc are outdated so follow [this exemplar](https://pkgsrc.smartos.org/install-on-illumos/) as well:
 
+For Solaris based OSes, `${CMAKE_SYSTEM_NAME}` isn't properly set on CMake (it's set to i686 on AMD64), you may find issues when building OpenSSL from `openssl-cmake`.
+
 ## HaikuOS
 
 It's recommended to do a `pkgman full-sync` before installing. See [HaikuOS: Installing applications](https://www.haiku-os.org/guides/daily-tasks/install-applications/). Sometimes the process may be interrupted by an error like "Interrupted syscall". Simply firing the command again fixes the issue. By default `g++` is included on the default installation.

docs/Deps.md

@@ -273,7 +273,7 @@ If using FreeBSD 12 or prior, use `devel/pkg-config` instead.
 For NetBSD +10.1:
 
 ```sh
-pkgin install git cmake boost fmtlib SDL3 catch2 libjwt spirv-headers spirv-tools ffmpeg7 libva nlohmann-json jq libopus qt6 cpp-httplib lz4 vulkan-headers nasm autoconf enet pkg-config libusb1 libcxx frozen
+pkgin install git cmake boost fmtlib SDL3 catch2 libjwt spirv-headers spirv-tools ffmpeg7 libva nlohmann-json jq libopus qt6-qtbase qt6-qtcharts qt6-qtmultimedia qt6-qttools cpp-httplib lz4 vulkan-headers nasm autoconf enet pkg-config libusb1 libcxx frozen
 ```
 
 [Caveats](./Caveats.md#netbsd).

src/core/file_sys/ips_layer.cpp

@@ -123,13 +123,11 @@ static IPSwitchRecord EscapeStringSequences(std::string_view sv) {
     for (auto it = sv.cbegin(); it != sv.cend(); ) {
         if (*it == '\\' && it + 1 < sv.cend()) {
             switch (it[1]) {
-            case 'a': r.data[r.count] = '\a'; break;
-            case 'b': r.data[r.count] = '\b'; break;
-            case 'e': r.data[r.count] = '\e'; break;
-            case 'f': r.data[r.count] = '\f'; break;
             case 'n': r.data[r.count] = '\n'; break;
-            case 'r': r.data[r.count] = '\r'; break;
             case 't': r.data[r.count] = '\t'; break;
+            case 'b': r.data[r.count] = '\b'; break;
+            case 'r': r.data[r.count] = '\r'; break;
+            case 'e': r.data[r.count] = '\e'; break;
             case 'v': r.data[r.count] = '\v'; break;
             case '?': r.data[r.count] = '\?'; break;
             default: r.data[r.count] = it[1]; break;
@@ -144,60 +142,40 @@ static IPSwitchRecord EscapeStringSequences(std::string_view sv) {
     return r;
 }
 
+[[nodiscard]] static inline std::array<u8, 32> ReadNSOBuildId(std::string_view const s) {
+    std::array<u8, 32> r{};
+    for (std::size_t i = 0; i < s.size(); ++i)
+        r[i / 2] |= u8(u8(Common::ToHexNibble(s[i])) << u8((i % 2) * 4));
+    return r;
+}
+
 void IPSwitchCompiler::Parse(std::span<u8 const> bytes) {
     LOG_INFO(Loader, "IPSwitchCompiler: '{}'", patch_text->GetName());
-    bool is_little_endian = true;
+    bool is_little_endian = false;
     s64 offset_shift = 0;
     //bool print_values = false;
+
     auto const parse_line = [&](std::string_view const line) {
         // Keep in mind lines have trimmed spaces (at the end & start)!
         LOG_INFO(Loader, "<{}>", line);
-        // IPSwitch is case insensitive
-        // Yes this is how the logic goes for the main reference parsers!
-        if (line.size() > 2 && line[0] == '@') {
-            switch (line[1]) {
-            // yes, @nsobid too -- NSO Build ID Specifier
-            case 'n':
-            case 'N':
-                nso_build_id = Common::HexStringToArray<0x20>(fmt::format("{:0<64}", line.substr(8)));
-                break;
-            // @stop
-            case 's':
-            case 'S':
-                return false;
-            // @enabled
-            case 'e':
-            case 'E':
-                patches.push_back({{}, true});
-                break;
-            // @disabled
-            case 'd':
-            case 'D':
-                patches.push_back({{}, false});
-                break;
-            // @flag
-            case 'f':
-            case 'F': {
-                if (line.starts_with("@flag offset_shift")) {
-                    offset_shift = std::strtoll(line.data() + 19, nullptr, 0);  // Offset Shift Flag
-                } else if (line.starts_with("@flag print_values")) {
-                    //print_values = true; // Force printing of applied values
-                }
-                break;
-            }
-            case 'l':
-            case 'L':
-                is_little_endian = true;
-                break;
-            // IPS parsers dont support big endian no more, we do due to backcompat
-            case 'b':
-            case 'B':
-                is_little_endian = false;
-                break;
-            default:
-                LOG_WARNING(Loader, "Unknown flag {}", line);
-                break;
-            }
+        if (line.starts_with("@stop")) {
+            return false; // Force stop
+        } else if (line.starts_with("@nsobid-")) { // NSO Build ID Specifier
+            nso_build_id = ReadNSOBuildId(line.substr(8));
+        } else if (line.starts_with("@enabled")) {
+            patches.push_back({{}, true}); //enabled patch
+        } else if (line.starts_with("@disabled")) {
+            patches.push_back({{}, false}); //disabled patch
+        } else if (line.starts_with("@flag offset_shift ")) {
+            offset_shift = std::strtoll(line.data() + 19, nullptr, 0);  // Offset Shift Flag
+        } else if (line.starts_with("@little-endian")) {
+            is_little_endian = true;  // Set values to read as little endian
+        } else if (line.starts_with("@big-endian")) {
+            is_little_endian = false;  // Set values to read as big endian
+        } else if (line.starts_with("@flag print_values")) {
+            //print_values = true; // Force printing of applied values
+        } else if (line.starts_with("@")) {
+            LOG_WARNING(Loader, "Unknown flag {}", line);
         } else {
             size_t offset = size_t(std::strtoul(line.data(), nullptr, 16));
             offset += size_t(offset_shift);
@@ -219,7 +197,6 @@ void IPSwitchCompiler::Parse(std::span<u8 const> bytes) {
                 auto const start = line.cbegin() + first_space + 1;
                 auto const end = line.cend();
                 if (start <= line.cend() && end <= line.cend()) {
-                    // Actually IPS wants ordering from {lsb, ..., msb} -- so LE and BE are inverted, fun!
                     auto const hs = Common::HexStringToVector({start, end}, is_little_endian);
                     std::memcpy(r.data.data(), hs.data(), hs.size());
                     r.count = hs.size();
@@ -254,8 +231,7 @@ void IPSwitchCompiler::Parse(std::span<u8 const> bytes) {
             char quote = '\0';
             auto const sline_start = p;
             for (; p < sline.cend(); ) {
-                // we dont check for "//", IPS checks for '/' only...
-                if ((!quote && p[0] == '/')
+                if ((!quote && p + 1 < sline.cend() && p[0] == '/' && p[1] == '/')
                 || (!quote && p[0] == '#')) {
                     break;
                 } else if (p[0] == '\"' || p[0] == '\'') {
@@ -290,8 +266,6 @@ VirtualFile IPSwitchCompiler::Apply(const VirtualFile& in) const {
                     if (record.first + replace_size > in_data.size())
                         replace_size = in_data.size() - record.first;
                     std::memcpy(in_data.data() + record.first, record.second.data.data(), replace_size);
-                } else {
-                    LOG_WARNING(Loader, "record offs={:x},size={:x}", record.first, record.second.data.size());
                 }
             }
         }

src/dynarmic/src/dynarmic/common/context.h

@@ -67,9 +67,7 @@
 #else
 #   define CTX_SP (_UC_MACHINE_SP(ucontext))
 #endif
-#endif
-
-#if defined(ARCHITECTURE_arm64)
+#elif defined(ARCHITECTURE_arm64)
 #    if defined(__APPLE__)
 #        define CTX_PC (mctx->__ss.__pc)
 #        define CTX_SP (mctx->__ss.__sp)

src/shader_recompiler/backend/spirv/emit_spirv.cpp

@@ -440,8 +440,7 @@ void SetupCapabilities(const Profile& profile, const Info& info, EmitContext& ct
     }
     if ((info.uses_subgroup_vote || info.uses_subgroup_invocation_id ||
          info.uses_subgroup_shuffles) &&
-        profile.support_vote &&
-        (ctx.stage != Stage::Geometry || profile.support_subgroup_in_geometry_stage)) {
+        profile.support_vote && profile.SupportsSubgroupStage(ctx.stage)) {
         ctx.AddCapability(spv::Capability::GroupNonUniformBallot);
         ctx.AddCapability(spv::Capability::GroupNonUniformShuffle);
         if (!profile.warp_size_potentially_larger_than_guest) {

src/shader_recompiler/backend/spirv/emit_spirv_warp.cpp

@@ -13,18 +13,6 @@ Id SubgroupScope(EmitContext& ctx) {
     return ctx.Const(static_cast<u32>(spv::Scope::Subgroup));
 }
 
-// Some mobile GPUs (e.g. Adreno/Turnip) only advertise subgroup ballot/shuffle support for the
-// fragment and compute stages (VkPhysicalDeviceSubgroupProperties::supportedStages), even though
-// they support these operations elsewhere. Guest shaders that use VOTE/SHFL in a geometry program
-// would otherwise emit GroupNonUniform* SPIR-V the driver never declared support for in that
-// stage. There is no barrier in the geometry stage, so a real cross-invocation emulation can't be
-// made correct; instead, treat the current invocation as if it were alone in its subgroup. This is
-// semantically wrong for guest code that relies on genuine cross-lane communication, but it is
-// well-defined, valid SPIR-V that doesn't depend on unsupported hardware capabilities.
-bool NeedsGeometrySubgroupFallback(EmitContext& ctx) {
-    return ctx.stage == Stage::Geometry && !ctx.profile.support_subgroup_in_geometry_stage;
-}
-
 bool StageSupportsSubgroups(EmitContext& ctx) {
     return ctx.profile.SupportsSubgroupStage(ctx.stage);
 }
@@ -106,9 +94,6 @@ Id AddPartitionBase(EmitContext& ctx, Id thread_id) {
 } // Anonymous namespace
 
 Id EmitLaneId(EmitContext& ctx) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        return ctx.u32_zero_value;
-    }
     const Id id{GetThreadId(ctx)};
     if (!ctx.profile.warp_size_potentially_larger_than_guest) {
         return id;
@@ -117,9 +102,6 @@ Id EmitLaneId(EmitContext& ctx) {
 }
 
 Id EmitVoteAll(EmitContext& ctx, Id pred) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        return pred;
-    }
     if (!StageSupportsSubgroups(ctx)) {
         return pred;
     }
@@ -136,9 +118,6 @@ Id EmitVoteAll(EmitContext& ctx, Id pred) {
 }
 
 Id EmitVoteAny(EmitContext& ctx, Id pred) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        return pred;
-    }
     if (!StageSupportsSubgroups(ctx)) {
         return pred;
     }
@@ -155,9 +134,6 @@ Id EmitVoteAny(EmitContext& ctx, Id pred) {
 }
 
 Id EmitVoteEqual(EmitContext& ctx, Id pred) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        return ctx.true_value;
-    }
     if (!StageSupportsSubgroups(ctx)) {
         return ctx.true_value;
     }
@@ -175,16 +151,6 @@ Id EmitVoteEqual(EmitContext& ctx, Id pred) {
 }
 
 Id EmitSubgroupBallot(EmitContext& ctx, Id pred) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        // Reflect only this invocation's own predicate. There is no way to observe other
-        // invocations' predicates without real subgroup hardware support in this stage, so this
-        // is a best-effort approximation: it keeps any branch gated on "did anyone match" live
-        // (rather than letting the SPIR-V optimizer prove it dead, which previously caused
-        // indirect draws fed by this shader to see indexCount=instanceCount=0), but any downstream
-        // math that assumes a real cross-lane population count (e.g. popcount-based compaction
-        // offsets) will not be correct.
-        return ctx.OpSelect(ctx.U32[1], pred, ctx.Const(1U), ctx.u32_zero_value);
-    }
     if (!StageSupportsSubgroups(ctx)) {
         return ctx.OpSelect(ctx.U32[1], pred, ctx.Const(1u), ctx.u32_zero_value);
     }
@@ -196,9 +162,6 @@ Id EmitSubgroupBallot(EmitContext& ctx, Id pred) {
 }
 
 Id EmitSubgroupEqMask(EmitContext& ctx) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        return ctx.Const(1U);
-    }
     if (!StageSupportsSubgroups(ctx)) {
         return ctx.Const(1u);
     }
@@ -206,9 +169,6 @@ Id EmitSubgroupEqMask(EmitContext& ctx) {
 }
 
 Id EmitSubgroupLtMask(EmitContext& ctx) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        return ctx.u32_zero_value;
-    }
     if (!StageSupportsSubgroups(ctx)) {
         return ctx.u32_zero_value;
     }
@@ -216,9 +176,6 @@ Id EmitSubgroupLtMask(EmitContext& ctx) {
 }
 
 Id EmitSubgroupLeMask(EmitContext& ctx) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        return ctx.Const(1U);
-    }
     if (!StageSupportsSubgroups(ctx)) {
         return ctx.Const(1u);
     }
@@ -226,9 +183,6 @@ Id EmitSubgroupLeMask(EmitContext& ctx) {
 }
 
 Id EmitSubgroupGtMask(EmitContext& ctx) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        return ctx.u32_zero_value;
-    }
     if (!StageSupportsSubgroups(ctx)) {
         return ctx.u32_zero_value;
     }
@@ -236,9 +190,6 @@ Id EmitSubgroupGtMask(EmitContext& ctx) {
 }
 
 Id EmitSubgroupGeMask(EmitContext& ctx) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        return ctx.Const(1U);
-    }
     if (!StageSupportsSubgroups(ctx)) {
         return ctx.Const(1u);
     }
@@ -247,10 +198,6 @@ Id EmitSubgroupGeMask(EmitContext& ctx) {
 
 Id EmitShuffleIndex(EmitContext& ctx, IR::Inst* inst, Id value, Id index, Id clamp,
                     Id segmentation_mask) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        SetInBoundsFlag(inst, ctx.false_value);
-        return value;
-    }
     const Id not_seg_mask{ctx.OpNot(ctx.U32[1], segmentation_mask)};
     const Id thread_id{EmitLaneId(ctx)};
     const Id min_thread_id{ComputeMinThreadId(ctx, thread_id, segmentation_mask)};
@@ -270,10 +217,6 @@ Id EmitShuffleIndex(EmitContext& ctx, IR::Inst* inst, Id value, Id index, Id cla
 
 Id EmitShuffleUp(EmitContext& ctx, IR::Inst* inst, Id value, Id index, Id clamp,
                  Id segmentation_mask) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        SetInBoundsFlag(inst, ctx.false_value);
-        return value;
-    }
     const Id thread_id{EmitLaneId(ctx)};
     const Id max_thread_id{GetMaxThreadId(ctx, thread_id, clamp, segmentation_mask)};
     Id src_thread_id{ctx.OpISub(ctx.U32[1], thread_id, index)};
@@ -289,10 +232,6 @@ Id EmitShuffleUp(EmitContext& ctx, IR::Inst* inst, Id value, Id index, Id clamp,
 
 Id EmitShuffleDown(EmitContext& ctx, IR::Inst* inst, Id value, Id index, Id clamp,
                    Id segmentation_mask) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        SetInBoundsFlag(inst, ctx.false_value);
-        return value;
-    }
     const Id thread_id{EmitLaneId(ctx)};
     const Id max_thread_id{GetMaxThreadId(ctx, thread_id, clamp, segmentation_mask)};
     Id src_thread_id{ctx.OpIAdd(ctx.U32[1], thread_id, index)};
@@ -308,10 +247,6 @@ Id EmitShuffleDown(EmitContext& ctx, IR::Inst* inst, Id value, Id index, Id clam
 
 Id EmitShuffleButterfly(EmitContext& ctx, IR::Inst* inst, Id value, Id index, Id clamp,
                         Id segmentation_mask) {
-    if (NeedsGeometrySubgroupFallback(ctx)) {
-        SetInBoundsFlag(inst, ctx.false_value);
-        return value;
-    }
     const Id thread_id{EmitLaneId(ctx)};
     const Id max_thread_id{GetMaxThreadId(ctx, thread_id, clamp, segmentation_mask)};
     Id src_thread_id{ctx.OpBitwiseXor(ctx.U32[1], thread_id, index)};

src/shader_recompiler/backend/spirv/spirv_emit_context.cpp

@@ -1455,14 +1455,13 @@ void EmitContext::DefineInputs(const IR::Program& program) {
     if (info.uses_is_helper_invocation) {
         is_helper_invocation = DefineInput(*this, U1, false, spv::BuiltIn::HelperInvocation);
     }
-    if (info.uses_subgroup_mask &&
-        (stage != Stage::Geometry || profile.support_subgroup_in_geometry_stage)) {
+    if (info.uses_subgroup_mask && profile.SupportsSubgroupStage(stage)) {
         subgroup_mask_eq = DefineInput(*this, U32[4], false, spv::BuiltIn::SubgroupEqMaskKHR);
         subgroup_mask_lt = DefineInput(*this, U32[4], false, spv::BuiltIn::SubgroupLtMaskKHR);
         subgroup_mask_le = DefineInput(*this, U32[4], false, spv::BuiltIn::SubgroupLeMaskKHR);
         subgroup_mask_gt = DefineInput(*this, U32[4], false, spv::BuiltIn::SubgroupGtMaskKHR);
         subgroup_mask_ge = DefineInput(*this, U32[4], false, spv::BuiltIn::SubgroupGeMaskKHR);
-        if (profile.support_explicit_workgroup_layout) {
+        if (stage == Stage::Fragment) {
             Decorate(subgroup_mask_eq, spv::Decoration::Flat);
             Decorate(subgroup_mask_lt, spv::Decoration::Flat);
             Decorate(subgroup_mask_le, spv::Decoration::Flat);
@@ -1470,11 +1469,10 @@ void EmitContext::DefineInputs(const IR::Program& program) {
             Decorate(subgroup_mask_ge, spv::Decoration::Flat);
         }
     }
-    if (info.uses_fswzadd ||
-        ((info.uses_subgroup_invocation_id || info.uses_subgroup_shuffles ||
-          (profile.warp_size_potentially_larger_than_guest &&
-           (info.uses_subgroup_vote || info.uses_subgroup_mask))) &&
-         (stage != Stage::Geometry || profile.support_subgroup_in_geometry_stage))) {
+    if ((info.uses_fswzadd || info.uses_subgroup_invocation_id || info.uses_subgroup_shuffles ||
+         (profile.warp_size_potentially_larger_than_guest &&
+          (info.uses_subgroup_vote || info.uses_subgroup_mask))) &&
+        profile.SupportsSubgroupStage(stage)) {
         AddCapability(spv::Capability::GroupNonUniform);
         subgroup_local_invocation_id =
             DefineInput(*this, U32[1], false, spv::BuiltIn::SubgroupLocalInvocationId);

src/shader_recompiler/profile.h

@@ -41,12 +41,6 @@ struct Profile {
     bool support_quad_shuffles{};
     bool support_vote{};
     u32 supported_subgroup_stages{0x7F};
-    bool support_subgroup_in_geometry_stage{}; ///< True when the device advertises subgroup
-                                               ///< ballot/shuffle support for VK_SHADER_STAGE_GEOMETRY_BIT
-                                               ///< (VkPhysicalDeviceSubgroupProperties::supportedStages).
-                                               ///< Many mobile GPUs support subgroup ops only in
-                                               ///< fragment/compute; guest shaders using VOTE/SHFL in a
-                                               ///< geometry program need a non-subgroup fallback there.
     bool support_viewport_index_layer_non_geometry{};
     bool support_viewport_mask{};
     bool support_typeless_image_loads{};

src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

@@ -410,11 +410,6 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
         .support_quad_shuffles = device.IsSubgroupFeatureSupported(VK_SUBGROUP_FEATURE_QUAD_BIT),
         .support_vote = device.IsSubgroupFeatureSupported(VK_SUBGROUP_FEATURE_VOTE_BIT),
         .supported_subgroup_stages = supported_subgroup_stages,
-        .support_subgroup_in_geometry_stage =
-            device.IsSubgroupFeatureSupported(VK_SUBGROUP_FEATURE_VOTE_BIT) &&
-            device.IsSubgroupFeatureSupported(VK_SUBGROUP_FEATURE_BALLOT_BIT) &&
-            device.IsSubgroupFeatureSupported(VK_SUBGROUP_FEATURE_SHUFFLE_BIT) &&
-            device.IsSubgroupFeatureSupportedInStage(VK_SHADER_STAGE_GEOMETRY_BIT),
         .support_viewport_index_layer_non_geometry =
             device.IsExtShaderViewportIndexLayerSupported(),
         .support_viewport_mask = device.IsNvViewportArray2Supported(),

src/video_core/vulkan_common/vulkan_device.h

@@ -479,11 +479,6 @@ FN_MAX_LIMIT_LIST
         return properties.subgroup_properties.supportedStages;
     }
 
-    /// Returns true if the device supports subgroup ballot/shuffle in the given shader stage.
-    bool IsSubgroupFeatureSupportedInStage(VkShaderStageFlagBits stage) const {
-        return properties.subgroup_properties.supportedStages & stage;
-    }
-
     /// Returns the maximum number of push descriptors.
     u32 MaxPushDescriptors() const {
         return properties.push_descriptor.maxPushDescriptors;

src/video_core/vulkan_common/vulkan_instance.cpp

@@ -43,26 +43,32 @@ namespace {
     switch (window_type) {
     case Core::Frontend::WindowSystemType::Headless:
         break;
-#ifdef _WIN32
+#if defined(VK_USE_PLATFORM_WIN32_KHR)
     case Core::Frontend::WindowSystemType::Windows:
         extensions.push_back(VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
         break;
-#elif defined(__APPLE__)
+#endif
+#if defined(VK_USE_PLATFORM_METAL_EXT)
     case Core::Frontend::WindowSystemType::Cocoa:
         extensions.push_back(VK_EXT_METAL_SURFACE_EXTENSION_NAME);
         break;
-#elif defined(__ANDROID__)
+#endif
+#if defined(VK_USE_PLATFORM_ANDROID_KHR)
     case Core::Frontend::WindowSystemType::Android:
         extensions.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
         break;
-#elif defined(__HAIKU__)
+#endif
+#if defined(VK_USE_PLATFORM_XCB_KHR)
     case Core::Frontend::WindowSystemType::Xcb:
         extensions.push_back(VK_KHR_XCB_SURFACE_EXTENSION_NAME);
         break;
-#else
+#endif
+#if defined(VK_USE_PLATFORM_XLIB_KHR)
     case Core::Frontend::WindowSystemType::X11:
         extensions.push_back(VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
         break;
+#endif
+#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
     case Core::Frontend::WindowSystemType::Wayland:
         extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
         break;

src/video_core/vulkan_common/vulkan_surface.cpp

@@ -8,6 +8,7 @@
 #include "core/frontend/emu_window.h"
 #include "video_core/vulkan_common/vulkan_surface.h"
 #include "video_core/vulkan_common/vulkan_wrapper.h"
+#include "video_core/vulkan_common/vulkan.h"
 
 namespace Vulkan {
 
@@ -17,7 +18,7 @@ vk::SurfaceKHR CreateSurface(
     [[maybe_unused]] const vk::InstanceDispatch& dld = instance.Dispatch();
     VkSurfaceKHR unsafe_surface = VkSurfaceKHR{};
 
-#ifdef _WIN32
+#if defined(VK_USE_PLATFORM_WIN32_KHR)
     if (window_info.type == Core::Frontend::WindowSystemType::Windows) {
         const HWND hWnd = static_cast<HWND>(window_info.render_surface);
         const VkWin32SurfaceCreateInfoKHR win32_ci{VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR,
@@ -30,7 +31,8 @@ vk::SurfaceKHR CreateSurface(
             throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED);
         }
     }
-#elif defined(__APPLE__)
+#endif
+#if defined(VK_USE_PLATFORM_METAL_EXT)
     if (window_info.type == Core::Frontend::WindowSystemType::Cocoa) {
         const VkMetalSurfaceCreateInfoEXT metal_ci = {
             .sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT,
@@ -45,7 +47,8 @@ vk::SurfaceKHR CreateSurface(
             throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED);
         }
     }
-#elif defined(__ANDROID__)
+#endif
+#if defined(VK_USE_PLATFORM_ANDROID_KHR)
     if (window_info.type == Core::Frontend::WindowSystemType::Android) {
         const VkAndroidSurfaceCreateInfoKHR android_ci{
             VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR, nullptr, 0,
@@ -59,7 +62,8 @@ vk::SurfaceKHR CreateSurface(
             throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED);
         }
     }
-#elif defined(__HAIKU__)
+#endif
+#if defined(VK_USE_PLATFORM_XCB_KHR)
     if (window_info.type == Core::Frontend::WindowSystemType::Xcb) {
         const VkXcbSurfaceCreateInfoKHR xcb_ci{
             .sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR,
@@ -76,7 +80,8 @@ vk::SurfaceKHR CreateSurface(
             throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED);
         }
     }
-#else
+#endif
+#if defined(VK_USE_PLATFORM_XLIB_KHR)
     if (window_info.type == Core::Frontend::WindowSystemType::X11) {
         const VkXlibSurfaceCreateInfoKHR xlib_ci{
             VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR, nullptr, 0,
@@ -90,6 +95,8 @@ vk::SurfaceKHR CreateSurface(
             throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED);
         }
     }
+#endif
+#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
     if (window_info.type == Core::Frontend::WindowSystemType::Wayland) {
         const VkWaylandSurfaceCreateInfoKHR wayland_ci{
             VK_STRUCTURE_TYPE_WAYLAND_SURFACE_CREATE_INFO_KHR, nullptr, 0,
@@ -105,7 +112,6 @@ vk::SurfaceKHR CreateSurface(
         }
     }
 #endif
-
     if (!unsafe_surface) {
         LOG_ERROR(Render_Vulkan, "Presentation not supported on this platform");
         throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED);