mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 08:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix rebase

Browse Source
This commit is contained in:
auser1337 2024-10-19 18:51:13 -07:00
parent 53d936f5fa
commit 124791332f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_core/page_manager.cpp
View File

@ -10,7 +10,7 @@
#include "core/signals.h" #include "core/signals.h"
#include "video_core/page_manager.h" #include "video_core/page_manager.h"
#include "video_core/renderer_vulkan/vk_rasterizer.h" #include "video_core/renderer_vulkan/vk_rasterizer.h"
#define ENABLE_USERFAULTFD 1
#ifndef _WIN64 #ifndef _WIN64
#include <sys/mman.h> #include <sys/mman.h>
#ifdef ENABLE_USERFAULTFD #ifdef ENABLE_USERFAULTFD
@ -142,6 +142,9 @@ struct PageManager::Impl {
} }
void Protect(VAddr address, size_t size, bool allow_write) { 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 #ifdef _WIN32
DWORD prot = allow_write ? PAGE_READWRITE : PAGE_READONLY; DWORD prot = allow_write ? PAGE_READWRITE : PAGE_READONLY;
DWORD old_prot{}; DWORD old_prot{};

2
src/video_core/renderer_vulkan/liverpool_to_vk.cpp
View File

@ -212,8 +212,6 @@ vk::SamplerAddressMode ClampMode(AmdGpu::ClampMode mode) {
[[fallthrough]]; [[fallthrough]];
case AmdGpu::ClampMode::ClampBorder: case AmdGpu::ClampMode::ClampBorder:
return vk::SamplerAddressMode::eClampToBorder; return vk::SamplerAddressMode::eClampToBorder;
case AmdGpu::ClampMode::ClampHalfBorder:
return vk::SamplerAddressMode::eClampToBorder;
default: default:
UNREACHABLE(); UNREACHABLE();
} }