From 124791332fc4667bf467c2ef9c593e35292c7a93 Mon Sep 17 00:00:00 2001 From: auser1337 Date: Sat, 19 Oct 2024 18:51:13 -0700 Subject: [PATCH] fix rebase --- src/video_core/page_manager.cpp | 5 ++++- src/video_core/renderer_vulkan/liverpool_to_vk.cpp | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/video_core/page_manager.cpp b/src/video_core/page_manager.cpp index a5d065ba5..a49fff43a 100644 --- a/src/video_core/page_manager.cpp +++ b/src/video_core/page_manager.cpp @@ -10,7 +10,7 @@ #include "core/signals.h" #include "video_core/page_manager.h" #include "video_core/renderer_vulkan/vk_rasterizer.h" -#define ENABLE_USERFAULTFD 1 + #ifndef _WIN64 #include #ifdef ENABLE_USERFAULTFD @@ -142,6 +142,9 @@ struct PageManager::Impl { } void Protect(VAddr address, size_t size, bool allow_write) { + ASSERT_MSG(owned_ranges.find(address) != owned_ranges.end(), + "Attempted to track non-GPU memory at address {:#x}, size {:#x}.", address, + size); #ifdef _WIN32 DWORD prot = allow_write ? PAGE_READWRITE : PAGE_READONLY; DWORD old_prot{}; diff --git a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp index 48c055534..a68ec1e74 100644 --- a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp +++ b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp @@ -212,8 +212,6 @@ vk::SamplerAddressMode ClampMode(AmdGpu::ClampMode mode) { [[fallthrough]]; case AmdGpu::ClampMode::ClampBorder: return vk::SamplerAddressMode::eClampToBorder; - case AmdGpu::ClampMode::ClampHalfBorder: - return vk::SamplerAddressMode::eClampToBorder; default: UNREACHABLE(); }