Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion attachments/simple_engine/renderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -1566,7 +1566,6 @@ class Renderer {
VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME,
VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME,
VK_KHR_DEPTH_STENCIL_RESOLVE_EXTENSION_NAME,
VK_EXT_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_EXTENSION_NAME,
VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME,
// Robustness and safety
VK_EXT_ROBUSTNESS_2_EXTENSION_NAME,
Expand Down
16 changes: 0 additions & 16 deletions attachments/simple_engine/renderer_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -795,23 +795,7 @@ void Renderer::addSupportedOptionalExtensions() {
avail.insert(e.extensionName);
}

// First, handle dependency: VK_EXT_attachment_feedback_loop_dynamic_state requires VK_EXT_attachment_feedback_loop_layout
const char* dynState = VK_EXT_ATTACHMENT_FEEDBACK_LOOP_DYNAMIC_STATE_EXTENSION_NAME;
const char* layoutReq = "VK_EXT_attachment_feedback_loop_layout";
bool dynSupported = avail.contains(dynState);
bool layoutSupported = avail.contains(layoutReq);
for (const auto& optionalExt : optionalDeviceExtensions) {
if (std::strcmp(optionalExt, dynState) == 0) {
if (dynSupported && layoutSupported) {
deviceExtensions.push_back(dynState);
deviceExtensions.push_back(layoutReq);
std::cout << "Adding optional extension: " << dynState << std::endl;
std::cout << "Adding required-by-optional extension: " << layoutReq << std::endl;
} else if (dynSupported && !layoutSupported) {
std::cout << "Skipping extension due to missing dependency: " << dynState << " requires " << layoutReq << std::endl;
}
continue; // handled
}
if (avail.contains(optionalExt)) {
deviceExtensions.push_back(optionalExt);
std::cout << "Adding optional extension: " << optionalExt << std::endl;
Expand Down
12 changes: 6 additions & 6 deletions attachments/simple_engine/renderer_rendering.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ void Renderer::renderReflectionPass(vk::raii::CommandBuffer& cmd,
.srcStageMask = vk::PipelineStageFlagBits2::eTopOfPipe,
.srcAccessMask = {},
.dstStageMask = vk::PipelineStageFlagBits2::eColorAttachmentOutput,
.dstAccessMask = vk::AccessFlagBits2::eColorAttachmentWrite,
.dstAccessMask = vk::AccessFlagBits2::eColorAttachmentWrite | vk::AccessFlagBits2::eColorAttachmentRead,
.oldLayout = vk::ImageLayout::eShaderReadOnlyOptimal,
.newLayout = vk::ImageLayout::eColorAttachmentOptimal,
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
Expand All @@ -327,7 +327,7 @@ void Renderer::renderReflectionPass(vk::raii::CommandBuffer& cmd,
.srcStageMask = vk::PipelineStageFlagBits2::eTopOfPipe,
.srcAccessMask = {},
.dstStageMask = vk::PipelineStageFlagBits2::eEarlyFragmentTests,
.dstAccessMask = vk::AccessFlagBits2::eDepthStencilAttachmentWrite,
.dstAccessMask = vk::AccessFlagBits2::eDepthStencilAttachmentWrite | vk::AccessFlagBits2::eDepthStencilAttachmentRead,
.oldLayout = vk::ImageLayout::eUndefined,
.newLayout = vk::ImageLayout::eDepthAttachmentOptimal,
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
Expand Down Expand Up @@ -1924,7 +1924,7 @@ void Renderer::Render(const std::vector<Entity *>& entities, CameraComponent* ca
swapchainToColor.srcStageMask = vk::PipelineStageFlagBits2::eBottomOfPipe;
swapchainToColor.srcAccessMask = vk::AccessFlagBits2::eNone;
swapchainToColor.dstStageMask = vk::PipelineStageFlagBits2::eColorAttachmentOutput;
swapchainToColor.dstAccessMask = vk::AccessFlagBits2::eColorAttachmentWrite;
swapchainToColor.dstAccessMask = vk::AccessFlagBits2::eColorAttachmentWrite | vk::AccessFlagBits2::eColorAttachmentRead;
swapchainToColor.oldLayout = (imageIndex < swapChainImageLayouts.size()) ? swapChainImageLayouts[imageIndex] : vk::ImageLayout::eUndefined;
swapchainToColor.newLayout = vk::ImageLayout::eColorAttachmentOptimal;
swapchainToColor.image = swapChainImages[imageIndex];
Expand Down Expand Up @@ -2362,7 +2362,7 @@ void Renderer::Render(const std::vector<Entity *>& entities, CameraComponent* ca
.srcStageMask = oscSrcStage,
.srcAccessMask = oscSrcAccess,
.dstStageMask = vk::PipelineStageFlagBits2::eColorAttachmentOutput,
.dstAccessMask = vk::AccessFlagBits2::eColorAttachmentWrite,
.dstAccessMask = vk::AccessFlagBits2::eColorAttachmentWrite | vk::AccessFlagBits2::eColorAttachmentRead,
.oldLayout = oscOldLayout,
.newLayout = vk::ImageLayout::eColorAttachmentOptimal,
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
Expand Down Expand Up @@ -2471,7 +2471,7 @@ void Renderer::Render(const std::vector<Entity *>& entities, CameraComponent* ca
.srcStageMask = vk::PipelineStageFlagBits2::eBottomOfPipe,
.srcAccessMask = vk::AccessFlagBits2::eNone,
.dstStageMask = vk::PipelineStageFlagBits2::eColorAttachmentOutput,
.dstAccessMask = vk::AccessFlagBits2::eColorAttachmentWrite,
.dstAccessMask = vk::AccessFlagBits2::eColorAttachmentWrite | vk::AccessFlagBits2::eColorAttachmentRead,
.oldLayout = vk::ImageLayout::eUndefined,
.newLayout = vk::ImageLayout::eColorAttachmentOptimal,
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
Expand Down Expand Up @@ -2620,7 +2620,7 @@ void Renderer::Render(const std::vector<Entity *>& entities, CameraComponent* ca
.srcStageMask = vk::PipelineStageFlagBits2::eBottomOfPipe,
.srcAccessMask = vk::AccessFlagBits2::eNone,
.dstStageMask = vk::PipelineStageFlagBits2::eColorAttachmentOutput,
.dstAccessMask = vk::AccessFlagBits2::eColorAttachmentWrite,
.dstAccessMask = vk::AccessFlagBits2::eColorAttachmentWrite | vk::AccessFlagBits2::eColorAttachmentRead,
.oldLayout = (imageIndex < swapChainImageLayouts.size()) ? swapChainImageLayouts[imageIndex] : vk::ImageLayout::eUndefined,
.newLayout = vk::ImageLayout::eColorAttachmentOptimal,
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
Expand Down
13 changes: 3 additions & 10 deletions attachments/simple_engine/vulkan_device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,12 @@ bool VulkanDevice::pickPhysicalDevice() {
}

// Check for required features
auto features = device.template getFeatures2<vk::PhysicalDeviceFeatures2, vk::PhysicalDeviceVulkan13Features, vk::PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT>();
auto features = device.template getFeatures2<vk::PhysicalDeviceFeatures2, vk::PhysicalDeviceVulkan13Features>();
bool supportsRequiredFeatures = (features.template get<vk::PhysicalDeviceVulkan13Features>().dynamicRendering == VK_TRUE);
if (!supportsRequiredFeatures) {
std::cout << " - Does not support required features (dynamicRendering)" << std::endl;
}

if (features.template get<vk::PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT>().attachmentFeedbackLoopLayout == VK_FALSE) {
supportsRequiredFeatures = false;
std::cout << " - Does not support required feature (attachmentFeedbackLoopLayout)" << std::endl;
}

return supportsVulkan1_3 && supportsGraphics && supportsAllRequiredExtensions && swapChainAdequate && supportsRequiredFeatures;
});

Expand Down Expand Up @@ -142,12 +137,10 @@ bool VulkanDevice::createLogicalDevice(bool enableValidationLayers, const std::v
// Enable required features using StructureChain
vk::StructureChain<
vk::PhysicalDeviceFeatures2,
vk::PhysicalDeviceVulkan13Features,
vk::PhysicalDeviceAttachmentFeedbackLoopLayoutFeaturesEXT
vk::PhysicalDeviceVulkan13Features
> featureChain{
{.features = {.depthClamp = vk::True, .samplerAnisotropy = vk::True}},
{.synchronization2 = vk::True, .dynamicRendering = vk::True},
{.attachmentFeedbackLoopLayout = vk::True}
{.synchronization2 = vk::True, .dynamicRendering = vk::True}
};
auto& features = featureChain.get<vk::PhysicalDeviceFeatures2>();

Expand Down
Loading