build

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

src/CMakeLists.txt

@@ -121,7 +121,7 @@ else()
         -Werror=unused
 
         -Wno-attributes
-        -Wno-invalid-offsetof
+        $<$<COMPILE_LANGUAGE:CXX>:-Wno-invalid-offsetof>
         -Wno-unused-parameter
         -Wno-missing-field-initializers
     )

src/video_core/renderer_vulkan/present/fsr.cpp

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 

src/video_core/renderer_vulkan/present/fxaa.cpp

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 

src/video_core/renderer_vulkan/present/layer.cpp

@@ -17,7 +17,6 @@
 #include "video_core/renderer_vulkan/present/util.h"
 #include "video_core/renderer_vulkan/vk_blit_screen.h"
 #include "video_core/textures/decoders.h"
-#include "video_core/vulkan_common/vulkan_device.h"
 
 namespace Vulkan {
 

src/video_core/renderer_vulkan/present/util.cpp

@@ -5,9 +5,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "common/assert.h"
-#include <ranges>
 #include "video_core/renderer_vulkan/present/util.h"
-#include "video_core/vulkan_common/vulkan_device.h"
 
 namespace Vulkan {
 

src/video_core/renderer_vulkan/vk_swapchain.cpp

@@ -210,7 +210,7 @@ void Swapchain::Present(VkSemaphore render_semaphore) {
     // on the first present to validate the driver/compositor accepts present-region info.
     VkPresentRegionsKHR present_regions{};
     VkPresentRegionKHR region{};
-    VkRect2D rect{};
+    VkRectLayerKHR layer{};
 
     VkPresentInfoKHR present_info{
         .sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR,
@@ -225,10 +225,10 @@ void Swapchain::Present(VkSemaphore render_semaphore) {
 
     if (incremental_present_usable && !incremental_present_probed) {
         // Build a minimal present-region describing a single 1x1 dirty rect at (0,0).
-        rect.offset = {0, 0};
-        rect.extent = {1, 1};
+        layer.offset = {0, 0};
+        layer.extent = {1, 1};
         region.rectangleCount = 1;
-        region.pRectangles = ▭
+        region.pRectangles = &layer;
         present_regions.sType = VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR;
         present_regions.pNext = nullptr;
         present_regions.swapchainCount = 1;

src/video_core/vulkan_common/vulkan_device.cpp

@@ -416,6 +416,9 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
     const bool is_suitable = GetSuitability(surface != nullptr);
 
     const VkDriverId driver_id = properties.driver.driverID;
+    // uncomment this if you want per-device overrides :P
+    // const u32 device_id = properties.properties.deviceID;
+
     const bool is_radv = driver_id == VK_DRIVER_ID_MESA_RADV;
     const bool is_amd_driver =
         driver_id == VK_DRIVER_ID_AMD_PROPRIETARY || driver_id == VK_DRIVER_ID_AMD_OPEN_SOURCE;
@@ -426,7 +429,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
     const bool is_mvk = driver_id == VK_DRIVER_ID_MOLTENVK;
     const bool is_qualcomm = driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY;
     const bool is_turnip = driver_id == VK_DRIVER_ID_MESA_TURNIP;
-    const bool is_s8gen2 = device_id == 0x43050a01;
     const bool is_arm = driver_id == VK_DRIVER_ID_ARM_PROPRIETARY;
 
     if ((is_mvk || is_qualcomm || is_turnip || is_arm) && !is_suitable) {

src/video_core/vulkan_common/vulkan_device.h

@@ -83,7 +83,7 @@ VK_DEFINE_HANDLE(VmaAllocator)
     EXTENSION(KHR, SHADER_FLOAT_CONTROLS, shader_float_controls)                                   \
     EXTENSION(KHR, SPIRV_1_4, spirv_1_4)                                                           \
     EXTENSION(KHR, SWAPCHAIN, swapchain)                                                           \
-    EXTENSION(KHR, INCREMENTAL_PRESENT, incremental_present)                                     \
+    EXTENSION(KHR, INCREMENTAL_PRESENT, incremental_present)                                       \
     EXTENSION(KHR, SWAPCHAIN_MUTABLE_FORMAT, swapchain_mutable_format)                             \
     EXTENSION(EXT, SWAPCHAIN_MAINTENANCE_1, swapchain_maintenance1)                                \
     EXTENSION(KHR, IMAGE_FORMAT_LIST, image_format_list)                                           \
@@ -93,16 +93,16 @@ VK_DEFINE_HANDLE(VmaAllocator)
     EXTENSION(NV, VIEWPORT_SWIZZLE, viewport_swizzle)                                              \
     EXTENSION(EXT, DESCRIPTOR_INDEXING, descriptor_indexing)                                       \
     EXTENSION(EXT, FILTER_CUBIC, filter_cubic)                                                     \
-    EXTENSION(QCOM, FILTER_CUBIC_WEIGHTS, filter_cubic_weights)
-    EXTENSION(KHR, MAINTENANCE_1, maintenance1)                                        \
-    EXTENSION(KHR, MAINTENANCE_2, maintenance2)                                           \
-    EXTENSION(KHR, MAINTENANCE_3, maintenance3)                                           \
-    EXTENSION(KHR, MAINTENANCE_4, maintenance4)                                           \
-    EXTENSION(KHR, MAINTENANCE_5, maintenance5)                                           \
-    EXTENSION(KHR, MAINTENANCE_6, maintenance6)                                           \
-    EXTENSION(KHR, MAINTENANCE_7, maintenance7)                                           \
-    EXTENSION(KHR, MAINTENANCE_8, maintenance8)                                           \
-    EXTENSION(KHR, MAINTENANCE_9, maintenance9)                                           \
+    EXTENSION(QCOM, FILTER_CUBIC_WEIGHTS, filter_cubic_weights)                                    \
+    EXTENSION(KHR, MAINTENANCE_1, maintenance1)                                                    \
+    EXTENSION(KHR, MAINTENANCE_2, maintenance2)                                                    \
+    EXTENSION(KHR, MAINTENANCE_3, maintenance3)                                                    \
+    EXTENSION(KHR, MAINTENANCE_4, maintenance4)                                                    \
+    EXTENSION(KHR, MAINTENANCE_5, maintenance5)                                                    \
+    EXTENSION(KHR, MAINTENANCE_6, maintenance6)                                                    \
+    EXTENSION(KHR, MAINTENANCE_7, maintenance7)                                                    \
+    EXTENSION(KHR, MAINTENANCE_8, maintenance8)                                                    \
+    EXTENSION(KHR, MAINTENANCE_9, maintenance9)
 
 // Define extensions which must be supported.
 #define FOR_EACH_VK_MANDATORY_EXTENSION(EXTENSION_NAME)                                            \