Skip to content

Support VK_KHR_dynamic_rendering_local_read #2799

Support VK_KHR_dynamic_rendering_local_read

Support VK_KHR_dynamic_rendering_local_read #2799

Triggered via pull request October 25, 2024 21:04
Status Failure
Total duration 1m 11s
Artifacts

ci.yml

on: pull_request
Commit message check
6s
Commit message check
Code formatting check
59s
Code formatting check
Baseline cmake check
0s
Baseline cmake check
Documentation Build
0s
Documentation Build
Android
0s
Android
Matrix: Linux
Matrix: Mac
Matrix: Windows
Fit to window
Zoom out
Zoom in

Annotations

2 errors
Code formatting check
clang-format issues were found. See CONTRIBUTING.md for more information. diff --git a/renderdoc/driver/vulkan/vk_pixelhistory.cpp b/renderdoc/driver/vulkan/vk_pixelhistory.cpp index ca2dd41..1995d21 100644 --- a/renderdoc/driver/vulkan/vk_pixelhistory.cpp +++ b/renderdoc/driver/vulkan/vk_pixelhistory.cpp @@ -3218,10 +3218,11 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback for(uint32_t i = 0; i < 2; i++) { uint32_t storeOffset = (fragsProcessed + f) * sizeof(PerFragmentInfo); - bool isPrimitiveIDPipe = i == 0; + bool isPrimitiveIDPipe = i == 0; - VkMarkerRegion region(cmd, StringFormat::Fmt("Getting %s for %u", - isPrimitiveIDPipe ? "primitive ID" : "shader output", eid)); + VkMarkerRegion region( + cmd, StringFormat::Fmt("Getting %s for %u", + isPrimitiveIDPipe ? "primitive ID" : "shader output", eid)); if(isPrimitiveIDPipe && !m_pDriver->GetDeviceEnabledFeatures().geometryShader) { @@ -3318,12 +3319,12 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback } } - // The primitive ID shader always writes to location 0, so make sure that's not remapped - // with VK_KHR_dynamic_rendering_local_read. - if (isPrimitiveIDPipe && prevState.dynamicRendering.localRead.AreLocationsNonDefault()) - { - state.dynamicRendering.localRead = DynamicRenderingLocalRead{}; - } + // The primitive ID shader always writes to location 0, so make sure that's not remapped + // with VK_KHR_dynamic_rendering_local_read. + if(isPrimitiveIDPipe && prevState.dynamicRendering.localRead.AreLocationsNonDefault()) + { + state.dynamicRendering.localRead = DynamicRenderingLocalRead{}; + } m_pDriver->GetCmdRenderState().BeginRenderPassAndApplyState( m_pDriver, cmd, VulkanRenderState::BindGraphics, false); @@ -3337,11 +3338,11 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback m_pDriver->ReplayDraw(cmd, *action); state.EndRenderPass(cmd); - // Restore location mapping for the other pipelines. - if (isPrimitiveIDPipe && prevState.dynamicRendering.localRead.AreLocationsNonDefault()) - { - state.dynamicRendering.localRead = prevState.dynamicRendering.localRead; - } + // Restore location mapping for the other pipelines. + if(isPrimitiveIDPipe && prevState.dynamicRendering.localRead.AreLocationsNonDefault()) + { + state.dynamicRendering.localRead = prevState.dynamicRendering.localRead; + } if(!isPrimitiveIDPipe) {
Code formatting check
Process completed with exit code 1.