50791cb974
* During pipeline configure the function would acquire some payload space from the descriptor update queue, write the descriptor data on the GPU thread and give the scheduler a pointer to the beginning of said space to update it later. TickFrame resets the payload cursor, used to track acquires, back to the beginning of the buffer. This wasn't a problem before since WaitWorker was called at the end of the frame but now it is. If a frame writes to a cursor before the scheduler catches up, it will crash * To fix this the payload buffer has been increased to account for the in flight frames that are allowed to exist now. TickFrame will switch between the payload spaces instead of resetting
45 lines
1.4 KiB
C++
45 lines
1.4 KiB
C++
// SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
#include <variant>
|
|
#include <boost/container/static_vector.hpp>
|
|
|
|
#include "common/logging/log.h"
|
|
#include "video_core/renderer_vulkan/vk_scheduler.h"
|
|
#include "video_core/renderer_vulkan/vk_update_descriptor.h"
|
|
#include "video_core/vulkan_common/vulkan_device.h"
|
|
#include "video_core/vulkan_common/vulkan_wrapper.h"
|
|
|
|
namespace Vulkan {
|
|
|
|
UpdateDescriptorQueue::UpdateDescriptorQueue(const Device& device_, Scheduler& scheduler_)
|
|
: device{device_}, scheduler{scheduler_} {
|
|
payload_start = payload.data();
|
|
payload_cursor = payload.data();
|
|
}
|
|
|
|
UpdateDescriptorQueue::~UpdateDescriptorQueue() = default;
|
|
|
|
void UpdateDescriptorQueue::TickFrame() {
|
|
if (++frame_index >= FRAMES_IN_FLIGHT) {
|
|
frame_index = 0;
|
|
}
|
|
payload_start = payload.data() + frame_index * FRAME_PAYLOAD_SIZE;
|
|
payload_cursor = payload_start;
|
|
}
|
|
|
|
void UpdateDescriptorQueue::Acquire() {
|
|
// Minimum number of entries required.
|
|
// This is the maximum number of entries a single draw call might use.
|
|
static constexpr size_t MIN_ENTRIES = 0x400;
|
|
|
|
if (std::distance(payload_start, payload_cursor) + MIN_ENTRIES >= FRAME_PAYLOAD_SIZE) {
|
|
LOG_WARNING(Render_Vulkan, "Payload overflow, waiting for worker thread");
|
|
scheduler.WaitWorker();
|
|
payload_cursor = payload_start;
|
|
}
|
|
upload_start = payload_cursor;
|
|
}
|
|
|
|
} // namespace Vulkan
|