thirdpartymirrors/lsfg-vk
1
0
Fork 0
mirror of https://github.com/PancakeTAS/lsfg-vk.git synced 2025-10-30 07:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfixes

Browse source
This commit is contained in:
PancakeTAS 2025-07-02 17:27:17 +02:00
parent 2fbc37e1ea
commit 990f45f06d
No known key found for this signature in database
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/application.cpp
View file

@ -9,7 +9,7 @@
#include <vector>
#include <vulkan/vulkan_core.h>
const int FRAMEGEN_N = 4; // number of frames to generate
const int FRAMEGEN_N = 2; // number of frames to generate
Application::Application(VkDevice device, VkPhysicalDevice physicalDevice,
VkQueue graphicsQueue, uint32_t graphicsQueueFamilyIndex)
@ -87,6 +87,7 @@ void Application::presentSwapchain(VkSwapchainKHR handle, VkQueue queue,
void SwapchainContext::present(const Application& app, VkQueue queue,
const std::vector<VkSemaphore>& semaphores, uint32_t idx, const void* pNext) {
// present deferred frame if any
bool yes = this->deferredIdx.has_value();
if (this->deferredIdx.has_value()) {
VkSemaphore deferredSemaphore = this->copySemaphores2.at((this->frameIdx - 1) % 8).handle();
const uint32_t deferredIdx = this->deferredIdx.value();
@ -184,8 +185,15 @@ void SwapchainContext::present(const Application& app, VkQueue queue,
0, 0, nullptr, 0, nullptr, 1, &presentBarrier);
cmdBuf1.end();
std::vector<VkSemaphore> semaphores2 = semaphores;
if (yes) {
VkSemaphore prevPresentSemaphore = this->prevPresentSemaphores.at((this->frameIdx - 1) % 8).at(FRAMEGEN_N - 1).handle();
semaphores2.emplace_back(prevPresentSemaphore);
}
cmdBuf1.submit(app.getGraphicsQueue(),
semaphores, { copySemaphore1.handle(), copySemaphore2.handle() });
semaphores2, { copySemaphore1.handle(), copySemaphore2.handle() });
// render the intermediary frames
std::vector<int> renderSems(FRAMEGEN_N);
@ -280,6 +288,7 @@ void SwapchainContext::present(const Application& app, VkQueue queue,
.image = dstImage2,
.subresourceRange = {
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
.levelCount = 1,
.layerCount = 1
}
@ -290,26 +299,27 @@ void SwapchainContext::present(const Application& app, VkQueue queue,
cmdBuf2.end();
std::vector<VkSemaphore> waitSemaphores;
waitSemaphores.emplace_back(acquireSemaphore.handle());
if (i != 0) // wait for previous present semaphore
waitSemaphores.emplace_back(prevPresentSemaphores.at(i - 1).handle());
std::vector<VkSemaphore> signalSemaphores;
signalSemaphores.emplace_back(presentSemaphore.handle());
if (i != FRAMEGEN_N - 1) {
// signal next present semaphore
prevPresentSemaphores.at(i) = Mini::Semaphore(app.getDevice());
signalSemaphores.emplace_back(prevPresentSemaphores.at(i).handle());
}
cmdBuf2.submit(app.getGraphicsQueue(), waitSemaphores, signalSemaphores);
auto& renderSemaphore = renderSemaphores.at(i);
cmdBuf2.submit(app.getGraphicsQueue(),
{ acquireSemaphore.handle(), renderSemaphore.handle() },
signalSemaphores);
// present the swapchain image
VkSemaphore presentSemaphoreHandle = presentSemaphore.handle();
std::vector<VkSemaphore> waitSemaphores;
waitSemaphores.emplace_back(presentSemaphore.handle());
if (i != 0) // wait for previous present semaphore
waitSemaphores.emplace_back(prevPresentSemaphores.at(i - 1).handle());
const VkPresentInfoKHR presentInfo = {
.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR,
.pNext = i == 0 ? pNext : nullptr, // only set on first present
.waitSemaphoreCount = 1,
.pWaitSemaphores = &presentSemaphoreHandle,
.waitSemaphoreCount = static_cast<uint32_t>(waitSemaphores.size()),
.pWaitSemaphores = waitSemaphores.data(),
.swapchainCount = 1,
.pSwapchains = &this->swapchain,
.pImageIndices = &newIdx,

4
src/hooks.cpp
View file

@ -4,6 +4,7 @@
#include "application.hpp"
#include "log.hpp"
#include <iostream>
#include <lsfg.hpp>
#include <optional>
@ -121,9 +122,10 @@ namespace {
const VkAllocationCallbacks* pAllocator,
VkSwapchainKHR* pSwapchain) {
VkSwapchainCreateInfoKHR createInfo = *pCreateInfo;
createInfo.minImageCount = 8;
createInfo.minImageCount += 3;
createInfo.imageUsage |= VK_IMAGE_USAGE_TRANSFER_DST_BIT;
createInfo.imageUsage |= VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
createInfo.presentMode = VK_PRESENT_MODE_FIFO_KHR;
auto res = vkCreateSwapchainKHR(device, &createInfo, pAllocator, pSwapchain);
// add the swapchain to the application