VERY experimental Nintendo Switch 2 emulator
C++
Fix Zephyron commits
MrPurple666e26a256a445c
diff --git a/src/video_core/renderer_vulkan/vk_texture_manager.cpp b/src/video_core/renderer_vulkan/vk_texture_manager.cppindex bad6c99f46..7fbf8c7a8c 100644--- a/src/video_core/renderer_vulkan/vk_texture_manager.cpp+++ b/src/video_core/renderer_vulkan/vk_texture_manager.cpp@@ -116,9 +116,9 @@ vk::Image TextureManager::LoadTexture(const std::string& texture_path) {vk::Image TextureManager::CreateDefaultTexture() {// Create a small default texture (1x1 pixel) to use as a fallback- const VkExtent2D extent{1, 1};+// const VkExtent2D extent{1, 1};- // Create image+/* // Create imageconst VkImageCreateInfo image_ci{.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,.pNext = nullptr,@@ -135,7 +135,7 @@ vk::Image TextureManager::CreateDefaultTexture() {.queueFamilyIndexCount = 0,.pQueueFamilyIndices = nullptr,.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED,- };+ }; */// TODO: create an actual VkImage [ZEP]LOG_INFO(Render_Vulkan, "Created default fallback texture");diff --git a/src/video_core/vulkan_common/hybrid_memory.cpp b/src/video_core/vulkan_common/hybrid_memory.cppindex 893f9dfe2b..bb06fae987 100644--- a/src/video_core/vulkan_common/hybrid_memory.cpp+++ b/src/video_core/vulkan_common/hybrid_memory.cpp@@ -205,7 +205,7 @@ void FaultManagedAllocator::ExceptionHandlerThread() {void FaultManagedAllocator::Initialize(void* base, size_t size) {#if defined(__linux__) || defined(__ANDROID__)- uffd = syscall(SYS_userfaultfd, O_CLOEXEC | O_NONBLOCK);+ uffd = static_cast<int>(syscall(SYS_userfaultfd, O_CLOEXEC | O_NONBLOCK));if (uffd < 0) {LOG_ERROR(Render_Vulkan, "Failed to create userfaultfd, fault handling disabled");return;