Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Minor code cleanups (hasBegun is now redundant, for example)

Browse source
This commit is contained in:
Henrik Rydgård 2022-09-20 16:52:14 +02:00
parent b190c33cc7
commit c1d1c85116
3 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Common/GPU/Vulkan/VulkanFrameData.h
View file

@ -73,7 +73,6 @@ struct FrameData {
std::vector<VKRStep *> steps; std::vector<VKRStep *> steps;
// Swapchain. // Swapchain.
bool hasBegun = false;
uint32_t curSwapchainImage = -1; uint32_t curSwapchainImage = -1;
// Profiling. // Profiling.

31
Common/GPU/Vulkan/VulkanRenderManager.cpp
View file

@ -1211,8 +1211,9 @@ void VulkanRenderManager::BeginSubmitFrame(int frame) {
_dbg_assert_(!frameData.hasPresentCommands); _dbg_assert_(!frameData.hasPresentCommands);
frameData.SubmitPending(vulkan_, FrameSubmitType::Pending, frameDataShared_); frameData.SubmitPending(vulkan_, FrameSubmitType::Pending, frameDataShared_);
if (!frameData.hasBegun) { if (!frameData.hasMainCommands) {
// Effectively resets both main and present command buffers, since they both live in this pool. // Effectively resets both main and present command buffers, since they both live in this pool.
// We always record main commands first, so we don't need to reset the present command buffer separately.
vkResetCommandPool(vulkan_->GetDevice(), frameData.cmdPoolMain, 0); vkResetCommandPool(vulkan_->GetDevice(), frameData.cmdPoolMain, 0);
VkCommandBufferBeginInfo begin{ VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO }; VkCommandBufferBeginInfo begin{ VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
@ -1220,26 +1221,14 @@ void VulkanRenderManager::BeginSubmitFrame(int frame) {
VkResult res = vkBeginCommandBuffer(frameData.mainCmd, &begin); VkResult res = vkBeginCommandBuffer(frameData.mainCmd, &begin);
frameData.hasMainCommands = true; frameData.hasMainCommands = true;
_assert_msg_(res == VK_SUCCESS, "vkBeginCommandBuffer failed! result=%s", VulkanResultToString(res)); _assert_msg_(res == VK_SUCCESS, "vkBeginCommandBuffer failed! result=%s", VulkanResultToString(res));
frameData.hasBegun = true;
} }
} }
// Called on the render thread.
void VulkanRenderManager::Submit(int frame, FrameSubmitType submitType) {
FrameData &frameData = frameData_[frame];
// Submit the main and final cmdbuf, ending by signalling the fence.
// If any init commands left unsubmitted (like by a frame sync etc), they'll also tag along.
frameData.SubmitPending(vulkan_, submitType, frameDataShared_);
}
// Called on the render thread. // Called on the render thread.
void VulkanRenderManager::EndSubmitFrame(int frame) { void VulkanRenderManager::EndSubmitFrame(int frame) {
FrameData &frameData = frameData_[frame]; FrameData &frameData = frameData_[frame];
frameData.hasBegun = false;
Submit(frame, FrameSubmitType::Present); frameData.SubmitPending(vulkan_, FrameSubmitType::Present, frameDataShared_);
if (!frameData.skipSwap) { if (!frameData.skipSwap) {
VkResult res = frameData.QueuePresent(vulkan_, frameDataShared_); VkResult res = frameData.QueuePresent(vulkan_, frameDataShared_);
@ -1265,20 +1254,12 @@ void VulkanRenderManager::EndSubmitFrame(int frame) {
void VulkanRenderManager::EndSyncFrame(int frame) { void VulkanRenderManager::EndSyncFrame(int frame) {
FrameData &frameData = frameData_[frame]; FrameData &frameData = frameData_[frame];
// The submit will trigger the readbackFence, and wait. // The submit will trigger the readbackFence, and also do the wait for it.
Submit(frame, FrameSubmitType::Sync); frameData.SubmitPending(vulkan_, FrameSubmitType::Sync, frameDataShared_);
// At this point we can resume filling the command buffers for the current frame since // At this point we can resume filling the command buffers for the current frame since
// we know the device is idle - and thus all previously enqueued command buffers have been processed. // we know the device is idle - and thus all previously enqueued command buffers have been processed.
// No need to switch to the next frame number. // No need to switch to the next frame number, would just be confusing.
VkCommandBufferBeginInfo begin{
VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
nullptr,
VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
};
_dbg_assert_(!frameData.hasPresentCommands); // Readbacks should happen before we try to submit any present commands.
frameData.hasBegun = false; // We're gonna record a new main command buffer.
std::unique_lock<std::mutex> lock(frameData.push_mutex); std::unique_lock<std::mutex> lock(frameData.push_mutex);
frameData.readyForFence = true; frameData.readyForFence = true;
frameData.push_condVar.notify_all(); frameData.push_condVar.notify_all();

2
Common/GPU/Vulkan/VulkanRenderManager.h
View file

@ -463,8 +463,6 @@ private:
void BeginSubmitFrame(int frame); void BeginSubmitFrame(int frame);
void EndSubmitFrame(int frame); void EndSubmitFrame(int frame);
void Submit(int frame, FrameSubmitType submitType);
void SubmitInitCommands(int frame);
// Bad for performance but sometimes necessary for synchronous CPU readbacks (screenshots and whatnot). // Bad for performance but sometimes necessary for synchronous CPU readbacks (screenshots and whatnot).
void FlushSync(); void FlushSync();