VERY experimental Nintendo Switch 2 emulator
C++
[macOS, compat] Allow games to boot in MacOS (#372)
innix6fcfe7f4f38f
diff --git a/src/common/host_memory.cpp b/src/common/host_memory.cppindex e70ac216cb..15a198e216 100644--- a/src/common/host_memory.cpp+++ b/src/common/host_memory.cpp@@ -12,7 +12,7 @@#include <windows.h>#include "common/dynamic_library.h"-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__sun__) // ^^^ Windows ^^^ vvv Linux vvv+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__sun__) || defined(__APPLE__) // ^^^ Windows ^^^ vvv POSIX vvv#ifndef _GNU_SOURCE#define _GNU_SOURCE@@ -20,10 +20,18 @@#include <boost/icl/interval_set.hpp>#include <fcntl.h>#include <sys/mman.h>-#include <sys/random.h>#include <unistd.h>#include "common/scope_exit.h"+#if defined(__linux__)+#include <sys/random.h>+#elif defined(__APPLE__)+#include <sys/types.h>+#include <sys/random.h>+#include <mach/vm_map.h>+#include <mach/mach.h>+#endif+// FreeBSD#ifndef MAP_NORESERVE#define MAP_NORESERVE 0@@ -32,8 +40,12 @@#ifndef MAP_ALIGNED_SUPER#define MAP_ALIGNED_SUPER 0#endif+// macOS+#ifndef MAP_ANONYMOUS+#define MAP_ANONYMOUS MAP_ANON+#endif-#endif // ^^^ Linux ^^^+#endif // ^^^ POSIX ^^^#include <mutex>#include <random>@@ -372,7 +384,7 @@ private:std::unordered_map<size_t, size_t> placeholder_host_pointers; ///< Placeholder backing offset};-#elif defined(__linux__) || defined(__FreeBSD__) || defined(__sun__) // ^^^ Windows ^^^ vvv Linux vvv+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__sun__) || defined(__APPLE__) // ^^^ Windows ^^^ vvv POSIX vvv#ifdef ARCHITECTURE_arm64@@ -489,6 +501,13 @@ public:#elif defined(__FreeBSD__) && __FreeBSD__ < 13// XXX Drop after FreeBSD 12.* reaches EOL on 2024-06-30fd = shm_open(SHM_ANON, O_RDWR, 0600);+#elif defined(__APPLE__)+ // macOS doesn't have memfd_create, use anonymous temporary file+ char template_path[] = "/tmp/eden_mem_XXXXXX";+ fd = mkstemp(template_path);+ if (fd >= 0) {+ unlink(template_path);+ }#elsefd = memfd_create("HostMemory", 0);#endif@@ -645,7 +664,7 @@ private:FreeRegionManager free_manager{};};-#else // ^^^ Linux ^^^ vvv Generic vvv+#else // ^^^ POSIX ^^^ vvv Generic vvvclass HostMemory::Impl {public:diff --git a/src/common/settings.h b/src/common/settings.hindex 64545d10ff..b657dc8658 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -551,6 +551,8 @@ struct Values {3,#elif defined (ANDROID)0,+#elif defined (__APPLE__)+ 0,#else2,#endifdiff --git a/src/video_core/renderer_vulkan/blit_image.cpp b/src/video_core/renderer_vulkan/blit_image.cppindex 596323fb32..37213912e3 100644--- a/src/video_core/renderer_vulkan/blit_image.cpp+++ b/src/video_core/renderer_vulkan/blit_image.cpp@@ -102,13 +102,16 @@ constexpr VkPipelineVertexInputStateCreateInfo PIPELINE_VERTEX_INPUT_STATE_CREAT.vertexAttributeDescriptionCount = 0,.pVertexAttributeDescriptions = nullptr,};-constexpr VkPipelineInputAssemblyStateCreateInfo PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO{- .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,- .pNext = nullptr,- .flags = 0,- .topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST,- .primitiveRestartEnable = VK_FALSE,-};++VkPipelineInputAssemblyStateCreateInfo GetPipelineInputAssemblyStateCreateInfo(const Device& device) {+ return VkPipelineInputAssemblyStateCreateInfo{+ .sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,+ .pNext = nullptr,+ .flags = 0,+ .topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST,+ .primitiveRestartEnable = device.IsMoltenVK() ? VK_TRUE : VK_FALSE,+ };+}constexpr VkPipelineViewportStateCreateInfo PIPELINE_VIEWPORT_STATE_CREATE_INFO{.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO,.pNext = nullptr,@@ -802,6 +805,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceColorPipeline(const BlitImagePipelineKe.pAttachments = &blend_attachment,.blendConstants = {0.0f, 0.0f, 0.0f, 0.0f},};+ const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);blit_color_pipelines.push_back(device.GetLogical().CreateGraphicsPipeline({.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,.pNext = nullptr,@@ -809,7 +813,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceColorPipeline(const BlitImagePipelineKe.stageCount = static_cast<u32>(stages.size()),.pStages = stages.data(),.pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,- .pInputAssemblyState = &PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,+ .pInputAssemblyState = &input_assembly_ci,.pTessellationState = nullptr,.pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,.pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,@@ -833,6 +837,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceDepthStencilPipeline(const BlitImagePip}blit_depth_stencil_keys.push_back(key);const std::array stages = MakeStages(*full_screen_vert, *blit_depth_stencil_frag);+ const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);blit_depth_stencil_pipelines.push_back(device.GetLogical().CreateGraphicsPipeline({.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,.pNext = nullptr,@@ -840,7 +845,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceDepthStencilPipeline(const BlitImagePip.stageCount = static_cast<u32>(stages.size()),.pStages = stages.data(),.pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,- .pInputAssemblyState = &PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,+ .pInputAssemblyState = &input_assembly_ci,.pTessellationState = nullptr,.pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,.pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,@@ -885,6 +890,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceClearColorPipeline(const BlitImagePipel.pAttachments = &color_blend_attachment_state,.blendConstants = {0.0f, 0.0f, 0.0f, 0.0f},};+ const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);clear_color_pipelines.push_back(device.GetLogical().CreateGraphicsPipeline({.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,.pNext = nullptr,@@ -892,7 +898,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceClearColorPipeline(const BlitImagePipel.stageCount = static_cast<u32>(stages.size()),.pStages = stages.data(),.pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,- .pInputAssemblyState = &PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,+ .pInputAssemblyState = &input_assembly_ci,.pTessellationState = nullptr,.pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,.pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,@@ -940,6 +946,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceClearStencilPipeline(.minDepthBounds = 0.0f,.maxDepthBounds = 0.0f,};+ const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);clear_stencil_pipelines.push_back(device.GetLogical().CreateGraphicsPipeline({.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,.pNext = nullptr,@@ -947,7 +954,7 @@ VkPipeline BlitImageHelper::FindOrEmplaceClearStencilPipeline(.stageCount = static_cast<u32>(stages.size()),.pStages = stages.data(),.pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,- .pInputAssemblyState = &PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,+ .pInputAssemblyState = &input_assembly_ci,.pTessellationState = nullptr,.pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,.pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,@@ -970,6 +977,7 @@ void BlitImageHelper::ConvertDepthToColorPipeline(vk::Pipeline& pipeline, VkRend}VkShaderModule frag_shader = *convert_float_to_depth_frag;const std::array stages = MakeStages(*full_screen_vert, frag_shader);+ const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);pipeline = device.GetLogical().CreateGraphicsPipeline({.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,.pNext = nullptr,@@ -977,7 +985,7 @@ void BlitImageHelper::ConvertDepthToColorPipeline(vk::Pipeline& pipeline, VkRend.stageCount = static_cast<u32>(stages.size()),.pStages = stages.data(),.pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,- .pInputAssemblyState = &PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,+ .pInputAssemblyState = &input_assembly_ci,.pTessellationState = nullptr,.pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,.pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,@@ -999,6 +1007,7 @@ void BlitImageHelper::ConvertColorToDepthPipeline(vk::Pipeline& pipeline, VkRend}VkShaderModule frag_shader = *convert_depth_to_float_frag;const std::array stages = MakeStages(*full_screen_vert, frag_shader);+ const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);pipeline = device.GetLogical().CreateGraphicsPipeline({.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,.pNext = nullptr,@@ -1006,7 +1015,7 @@ void BlitImageHelper::ConvertColorToDepthPipeline(vk::Pipeline& pipeline, VkRend.stageCount = static_cast<u32>(stages.size()),.pStages = stages.data(),.pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,- .pInputAssemblyState = &PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,+ .pInputAssemblyState = &input_assembly_ci,.pTessellationState = nullptr,.pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,.pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,@@ -1029,6 +1038,7 @@ void BlitImageHelper::ConvertPipelineEx(vk::Pipeline& pipeline, VkRenderPass renreturn;}const std::array stages = MakeStages(*full_screen_vert, *module);+ const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);pipeline = device.GetLogical().CreateGraphicsPipeline({.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,.pNext = nullptr,@@ -1036,7 +1046,7 @@ void BlitImageHelper::ConvertPipelineEx(vk::Pipeline& pipeline, VkRenderPass ren.stageCount = static_cast<u32>(stages.size()),.pStages = stages.data(),.pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,- .pInputAssemblyState = &PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,+ .pInputAssemblyState = &input_assembly_ci,.pTessellationState = nullptr,.pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,.pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,@@ -1070,6 +1080,7 @@ void BlitImageHelper::ConvertPipeline(vk::Pipeline& pipeline, VkRenderPass rendeVkShaderModule frag_shader =is_target_depth ? *convert_float_to_depth_frag : *convert_depth_to_float_frag;const std::array stages = MakeStages(*full_screen_vert, frag_shader);+ const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci = GetPipelineInputAssemblyStateCreateInfo(device);pipeline = device.GetLogical().CreateGraphicsPipeline({.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO,.pNext = nullptr,@@ -1077,7 +1088,7 @@ void BlitImageHelper::ConvertPipeline(vk::Pipeline& pipeline, VkRenderPass rende.stageCount = static_cast<u32>(stages.size()),.pStages = stages.data(),.pVertexInputState = &PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO,- .pInputAssemblyState = &PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,+ .pInputAssemblyState = &input_assembly_ci,.pTessellationState = nullptr,.pViewportState = &PIPELINE_VIEWPORT_STATE_CREATE_INFO,.pRasterizationState = &PIPELINE_RASTERIZATION_STATE_CREATE_INFO,diff --git a/src/video_core/renderer_vulkan/present/util.cpp b/src/video_core/renderer_vulkan/present/util.cppindex 6874bbae99..07b6a41c5c 100644--- a/src/video_core/renderer_vulkan/present/util.cpp+++ b/src/video_core/renderer_vulkan/present/util.cpp@@ -400,12 +400,12 @@ static vk::Pipeline CreateWrappedPipelineImpl(.pVertexAttributeDescriptions = nullptr,};- constexpr VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{+ const VkPipelineInputAssemblyStateCreateInfo input_assembly_ci{.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,.pNext = nullptr,.flags = 0,.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP,- .primitiveRestartEnable = VK_FALSE,+ .primitiveRestartEnable = device.IsMoltenVK() ? VK_TRUE : VK_FALSE,};constexpr VkPipelineViewportStateCreateInfo viewport_state_ci{diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cppindex 0226eb2c14..dc068c5e52 100644--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp@@ -635,14 +635,16 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) {.flags = 0,.topology = input_assembly_topology,.primitiveRestartEnable =- dynamic.primitive_restart_enable != 0 &&+ // MoltenVK/Metal always has primitive restart enabled and cannot disable it+ device.IsMoltenVK() ? VK_TRUE :+ (dynamic.primitive_restart_enable != 0 &&((input_assembly_topology != VK_PRIMITIVE_TOPOLOGY_PATCH_LIST &&device.IsTopologyListPrimitiveRestartSupported()) ||SupportsPrimitiveRestart(input_assembly_topology) ||(input_assembly_topology == VK_PRIMITIVE_TOPOLOGY_PATCH_LIST &&device.IsPatchListPrimitiveRestartSupported()))? VK_TRUE- : VK_FALSE,+ : VK_FALSE),};const VkPipelineTessellationStateCreateInfo tessellation_ci{.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO,diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cppindex 4d74bf00a5..6fdf1e7874 100644--- a/src/video_core/vulkan_common/vulkan_device.cpp+++ b/src/video_core/vulkan_common/vulkan_device.cpp@@ -725,6 +725,11 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHRdynamic_state3_enables = true;}+ if (is_mvk && Settings::values.dyna_state.GetValue() != 0) {+ LOG_WARNING(Render_Vulkan, "MoltenVK detected: Forcing dynamic state to 0 to prevent black screen issues");+ Settings::values.dyna_state.SetValue(0);+ }+if (Settings::values.dyna_state.GetValue() == 0) {must_emulate_scaled_formats = true;LOG_INFO(Render_Vulkan, "Dynamic state is disabled (dyna_state = 0), forcing scaled format emulation ON");@@ -1096,8 +1101,15 @@ bool Device::GetSuitability(bool requires_swapchain) {// Some features are mandatory. Check those.#define CHECK_FEATURE(feature, name) \if (!features.feature.name) { \- LOG_ERROR(Render_Vulkan, "Missing required feature {}", #name); \- suitable = false; \+ if (IsMoltenVK() && (strcmp(#name, "geometryShader") == 0 || \+ strcmp(#name, "logicOp") == 0 || \+ strcmp(#name, "shaderCullDistance") == 0 || \+ strcmp(#name, "wideLines") == 0)) { \+ LOG_INFO(Render_Vulkan, "MoltenVK missing feature {} - using fallback", #name); \+ } else { \+ LOG_ERROR(Render_Vulkan, "Missing required feature {}", #name); \+ suitable = false; \+ } \}#define LOG_FEATURE(feature, name) \diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.hindex 9b78f2e599..bd54144480 100644--- a/src/video_core/vulkan_common/vulkan_device.h+++ b/src/video_core/vulkan_common/vulkan_device.h@@ -717,6 +717,10 @@ public:return properties.driver.driverID == VK_DRIVER_ID_NVIDIA_PROPRIETARY;}+ bool IsMoltenVK() const noexcept {+ return properties.driver.driverID == VK_DRIVER_ID_MOLTENVK;+ }+NvidiaArchitecture GetNvidiaArch() const noexcept {return nvidia_arch;}diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cppindex 106630182f..949b91499d 100644--- a/src/video_core/vulkan_common/vulkan_wrapper.cpp+++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp@@ -580,6 +580,7 @@ DescriptorSets DescriptorPool::Allocate(const VkDescriptorSetAllocateInfo& ai) ccase VK_SUCCESS:return DescriptorSets(std::move(sets), num, owner, handle, *dld);case VK_ERROR_OUT_OF_POOL_MEMORY:+ case VK_ERROR_FRAGMENTED_POOL:return {};default:throw Exception(result);@@ -604,6 +605,7 @@ CommandBuffers CommandPool::Allocate(std::size_t num_buffers, VkCommandBufferLevcase VK_SUCCESS:return CommandBuffers(std::move(buffers), num_buffers, owner, handle, *dld);case VK_ERROR_OUT_OF_POOL_MEMORY:+ case VK_ERROR_FRAGMENTED_POOL:return {};default:throw Exception(result);diff --git a/src/yuzu/configuration/configure_graphics_extensions.cpp b/src/yuzu/configuration/configure_graphics_extensions.cppindex c8dee6b073..322fa9ea08 100644--- a/src/yuzu/configuration/configure_graphics_extensions.cpp+++ b/src/yuzu/configuration/configure_graphics_extensions.cpp@@ -60,6 +60,10 @@ void ConfigureGraphicsExtensions::Setup(const ConfigurationShared::Builder& builif (setting->Id() == Settings::values.dyna_state.Id()) {widget->slider->setTickInterval(1);widget->slider->setTickPosition(QSlider::TicksAbove);+#ifdef __APPLE__+ widget->setEnabled(false);+ widget->setToolTip(tr("Extended Dynamic State is disabled on macOS due to MoltenVK compatibility issues that cause black screens."));+#endif}}