Skip to content

ray tracing resize. #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gpx1000 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ray tracing resize. #297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 31 additions & 5 deletions attachments/38_ray_tracing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,7 @@ struct UniformBufferObject
struct PushConstant
{
uint32_t materialIndex;
#if LAB_TASK_LEVEL >= LAB_TASK_REFLECTIONS
// TASK11
uint32_t reflective;
#endif // LAB_TASK_LEVEL >= LAB_TASK_REFLECTIONS
};

class VulkanRaytracingApplication
Expand All @@ -123,6 +120,14 @@ class VulkanRaytracingApplication
cleanup();
}

~VulkanRaytracingApplication()
{
if (*device)
{
device.waitIdle();
}
}

private:
GLFWwindow *window = nullptr;

Expand Down Expand Up @@ -1629,6 +1634,8 @@ class VulkanRaytracingApplication
.materialIndex = sub.materialID < 0 ? 0u : static_cast<uint32_t>(sub.materialID),
#if LAB_TASK_LEVEL >= LAB_TASK_REFLECTIONS
.reflective = sub.reflective
#else
.reflective = 0u
#endif // LAB_TASK_LEVEL >= LAB_TASK_REFLECTIONS
};
commandBuffer.pushConstants<PushConstant>(pipelineLayout, vk::ShaderStageFlagBits::eFragment, 0, pushConstant);
Expand Down Expand Up @@ -1829,7 +1836,19 @@ class VulkanRaytracingApplication
throw std::runtime_error("failed to wait for fence!");
}

auto [result, imageIndex] = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
vk::Result result;
uint32_t imageIndex;
try
{
auto res = swapChain.acquireNextImage(UINT64_MAX, *presentCompleteSemaphores[frameIndex], nullptr);
result = res.result;
imageIndex = res.value;
}
catch (const vk::OutOfDateKHRError &e)
{
recreateSwapChain();
return;
}

// Due to VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS being defined, eErrorOutOfDateKHR can be checked as a result
// here and does not need to be caught by an exception.
Expand Down Expand Up @@ -1872,7 +1891,14 @@ class VulkanRaytracingApplication
.swapchainCount = 1,
.pSwapchains = &*swapChain,
.pImageIndices = &imageIndex};
result = presentQueue.presentKHR(presentInfoKHR);
try
{
result = presentQueue.presentKHR(presentInfoKHR);
}
catch (const vk::OutOfDateKHRError &e)
{
result = vk::Result::eErrorOutOfDateKHR;
}
// Due to VULKAN_HPP_HANDLE_ERROR_OUT_OF_DATE_AS_SUCCESS being defined, eErrorOutOfDateKHR can be checked as a result
// here and does not need to be caught by an exception.
if ((result == vk::Result::eSuboptimalKHR) || (result == vk::Result::eErrorOutOfDateKHR) || framebufferResized)
Expand Down
Loading