Browse Source

Fix Zephyron commits

nce_cpp
MrPurple666 8 months ago
parent
commit
e26a256a44
  1. 6
      src/video_core/renderer_vulkan/vk_texture_manager.cpp
  2. 2
      src/video_core/vulkan_common/hybrid_memory.cpp

6
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 image
const 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");

2
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;

Loading…
Cancel
Save