From c991d66b83e9c49e517b8f913699606c5463545d Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 30 Jan 2026 15:21:05 +0000 Subject: [PATCH] Add support for VK_QCOM_multiview_per_view_render_areas. Closes #3269 * When a shader doesn't export ViewportIndex, we treat it the same as our assumption that a 1:1 set of viewports will be selected by the shader. --- renderdoc/driver/vulkan/extension_support.md | 2 +- renderdoc/driver/vulkan/vk_common.h | 2 + renderdoc/driver/vulkan/vk_core.cpp | 4 + renderdoc/driver/vulkan/vk_core.h | 2 + renderdoc/driver/vulkan/vk_debug.cpp | 17 +++- renderdoc/driver/vulkan/vk_next_chains.cpp | 3 +- renderdoc/driver/vulkan/vk_overlay.cpp | 79 +++++++++++++++---- renderdoc/driver/vulkan/vk_replay.h | 2 +- renderdoc/driver/vulkan/vk_serialise.cpp | 24 +++++- .../vulkan/wrappers/vk_device_funcs.cpp | 9 +++ 10 files changed, 120 insertions(+), 24 deletions(-) diff --git a/renderdoc/driver/vulkan/extension_support.md b/renderdoc/driver/vulkan/extension_support.md index 72b56a661..c45101af3 100644 --- a/renderdoc/driver/vulkan/extension_support.md +++ b/renderdoc/driver/vulkan/extension_support.md @@ -268,6 +268,7 @@ Maintainers can update this file by updating vk.xml in this folder and running ` * `VK_NV_viewport_array2` * `VK_NV_win32_keyed_mutex` * `VK_QCOM_fragment_density_map_offset` +* `VK_QCOM_multiview_per_view_render_areas` * `VK_QCOM_render_pass_shader_resolve` * `VK_QCOM_render_pass_store_ops` * `VK_VALVE_fragment_density_map_layered` @@ -432,7 +433,6 @@ The portability subset is only relevant on mac, which is not a supported platfor * `VK_QCOM_filter_cubic_weights` * `VK_QCOM_image_processing` * `VK_QCOM_image_processing2` -* `VK_QCOM_multiview_per_view_render_areas` * `VK_QCOM_multiview_per_view_viewports` * `VK_QCOM_render_pass_transform` * `VK_QCOM_rotated_copy_commands` diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h index 9fd6dcc9c..661badaf1 100644 --- a/renderdoc/driver/vulkan/vk_common.h +++ b/renderdoc/driver/vulkan/vk_common.h @@ -1749,6 +1749,7 @@ DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMeshShaderFeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMeshShaderPropertiesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMultiviewFeatures); +DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMultiviewProperties); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT); DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceNestedCommandBufferFeaturesEXT); @@ -2278,6 +2279,7 @@ DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMeshShaderFeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMeshShaderPropertiesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMultiviewFeatures); +DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMultiviewProperties); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT); DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceNestedCommandBufferFeaturesEXT); diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index 6a7f0038f..25b753640 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -2068,6 +2068,10 @@ static const VkExtensionProperties supportedExtensions[] = { VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_EXTENSION_NAME, VK_QCOM_FRAGMENT_DENSITY_MAP_OFFSET_SPEC_VERSION, }, + { + VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_EXTENSION_NAME, + VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_SPEC_VERSION, + }, { VK_QCOM_RENDER_PASS_SHADER_RESOLVE_EXTENSION_NAME, VK_QCOM_RENDER_PASS_SHADER_RESOLVE_SPEC_VERSION, diff --git a/renderdoc/driver/vulkan/vk_core.h b/renderdoc/driver/vulkan/vk_core.h index 51800b297..5f354b5e5 100644 --- a/renderdoc/driver/vulkan/vk_core.h +++ b/renderdoc/driver/vulkan/vk_core.h @@ -590,6 +590,7 @@ private: bool m_Maintenance6 = false; bool m_Maintenance9 = false; bool m_DescriptorBuffers = false; + bool m_MultiviewPerViewViewports = false; uint32_t m_RTCaptureReplayHandleSize = 0; @@ -1570,6 +1571,7 @@ public: bool Maintenance6() const { return m_Maintenance6; } bool Maintenance9() const { return m_Maintenance9; } bool DescriptorBuffers() const { return m_DescriptorBuffers; } + bool MultiviewPerViewViewports() const { return m_MultiviewPerViewViewports; } VulkanRenderState &GetRenderState() { return m_RenderState; } void SetActionCB(VulkanActionCallback *cb) { m_ActionCallback = cb; } void SetSubmitChain(void *submitChain) { m_SubmitChain = submitChain; } diff --git a/renderdoc/driver/vulkan/vk_debug.cpp b/renderdoc/driver/vulkan/vk_debug.cpp index 827e48398..123e165a9 100644 --- a/renderdoc/driver/vulkan/vk_debug.cpp +++ b/renderdoc/driver/vulkan/vk_debug.cpp @@ -239,8 +239,13 @@ struct ConciseGraphicsPipeline uint32_t writeMask; }; +struct RareGraphicsProperties +{ + uint32_t viewCount = 1; +}; + static void create(WrappedVulkan *driver, const char *objName, const int line, VkPipeline *pipe, - const ConciseGraphicsPipeline &info) + const ConciseGraphicsPipeline &info, const RareGraphicsProperties &extra = {}) { // if the module didn't compile, this pipeline is not be supported. Silently don't create it, code // later should handle the missing pipeline as indicating lack of support @@ -357,7 +362,7 @@ static void create(WrappedVulkan *driver, const char *objName, const int line, V VkPipelineViewportStateCreateInfo viewScissor = { VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO}; - viewScissor.viewportCount = viewScissor.scissorCount = 1; + viewScissor.viewportCount = viewScissor.scissorCount = extra.viewCount; // add default scissor, if scissor is dynamic this will be ignored. VkRect2D scissor = {{0, 0}, {16384, 16384}}; @@ -4966,7 +4971,8 @@ void VulkanReplay::OverlayRendering::Init(WrappedVulkan *driver, VkDescriptorPoo driver->vkDestroyRenderPass(driver->GetDev(), SRGBA8MSRP, NULL); } -VkPipeline VulkanReplay::OverlayRendering::CreateTempViewportPipe(WrappedVulkan *driver) +VkPipeline VulkanReplay::OverlayRendering::CreateTempViewportPipe(WrappedVulkan *driver, + uint32_t viewCount) { VulkanShaderCache *shaderCache = driver->GetShaderCache(); @@ -4989,8 +4995,11 @@ VkPipeline VulkanReplay::OverlayRendering::CreateTempViewportPipe(WrappedVulkan 0xf, // writeMask }; + RareGraphicsProperties extra; + extra.viewCount = viewCount; + VkPipeline ret; - CREATE_OBJECT(ret, pipeInfo); + CREATE_OBJECT(ret, pipeInfo, extra); return ret; } diff --git a/renderdoc/driver/vulkan/vk_next_chains.cpp b/renderdoc/driver/vulkan/vk_next_chains.cpp index eaa28ede5..adb28691b 100644 --- a/renderdoc/driver/vulkan/vk_next_chains.cpp +++ b/renderdoc/driver/vulkan/vk_next_chains.cpp @@ -416,6 +416,8 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES, \ VkPhysicalDeviceMultiviewFeatures); \ + COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM, \ + VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PROPERTIES, \ VkPhysicalDeviceMultiviewProperties); \ COPY_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT, \ @@ -1235,7 +1237,6 @@ static void AppendModifiedChainedStruct(byte *&tempMem, VkStruct *outputStruct, case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTI_DRAW_PROPERTIES_EXT: \ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX: \ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM: \ - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM: \ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_FEATURES_EXT: \ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPACITY_MICROMAP_PROPERTIES_EXT: \ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_OPTICAL_FLOW_FEATURES_NV: \ diff --git a/renderdoc/driver/vulkan/vk_overlay.cpp b/renderdoc/driver/vulkan/vk_overlay.cpp index 6b1f4998e..18ea61198 100644 --- a/renderdoc/driver/vulkan/vk_overlay.cpp +++ b/renderdoc/driver/vulkan/vk_overlay.cpp @@ -999,6 +999,60 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D const VulkanCreationInfo::Pipeline &pipeInfo = m_pDriver->m_CreationInfo.m_Pipeline[state.graphics.pipeline]; + bool viewportPerView = false; + + // if we have multiview and _exactly_ as many viewports as multiview, assume a sane 1:1 + // mapping in reality this depends on shader execution to export ViewportIndex + // if multiview is disabled we just use the first viewport/scissor + if(multiviewMask == (1U << (state.views.size())) - 1) + viewportPerView = true; + + // if the extension is enabled to auto-select viewport per-view, check if the shader doesn't select + if(m_pDriver->MultiviewPerViewViewports()) + { + if(!state.graphics.shaderObject) + { + uint32_t shadIdx = (uint32_t)ShaderStage::Vertex; + if(pipeInfo.shaders[(uint32_t)ShaderStage::Geometry].module != ResourceId()) + shadIdx = (uint32_t)ShaderStage::Geometry; + else if(pipeInfo.shaders[(uint32_t)ShaderStage::Tess_Eval].module != ResourceId()) + shadIdx = (uint32_t)ShaderStage::Tess_Eval; + + const ShaderReflection *reflection = pipeInfo.shaders[shadIdx].refl; + bool outputsViewport = false; + for(const SigParameter &output : reflection->outputSignature) + { + if(output.systemValue == ShaderBuiltin::ViewportIndex) + outputsViewport = true; + } + + if(!outputsViewport) + viewportPerView = true; + } + else + { + VulkanCreationInfo &createinfo = m_pDriver->m_CreationInfo; + + uint32_t shadIdx = (uint32_t)ShaderStage::Vertex; + if(state.shaderObjects[(uint32_t)ShaderStage::Geometry] != ResourceId()) + shadIdx = (uint32_t)ShaderStage::Geometry; + else if(state.shaderObjects[(uint32_t)ShaderStage::Tess_Eval] != ResourceId()) + shadIdx = (uint32_t)ShaderStage::Tess_Eval; + + const ShaderReflection *reflection = + createinfo.m_ShaderObject[state.shaderObjects[shadIdx]].shad.refl; + bool outputsViewport = false; + for(const SigParameter &output : reflection->outputSignature) + { + if(output.systemValue == ShaderBuiltin::ViewportIndex) + outputsViewport = true; + } + + if(!outputsViewport) + viewportPerView = true; + } + } + bool rpActive = m_pDriver->IsPartialRenderPassActiveUnsuspended(); if((mainDraw && !(mainDraw->flags & (ActionFlags::MeshDispatch | ActionFlags::Drawcall))) || @@ -1560,8 +1614,6 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D CHECK_VKR(m_pDriver, vkr); } - checkerPipe = m_Overlay.CreateTempViewportPipe(m_pDriver); - // disable tests in dynamic state too state.depthTestEnable = VK_FALSE; state.depthWriteEnable = VK_FALSE; @@ -1631,10 +1683,7 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D uint32_t firstView = 0; uint32_t lastView = 0; - // if we have multiview and _exactly_ as many viewports as multiview, assume a sane 1:1 - // mapping in reality this depends on shader execution to export ViewportIndex - // if multiview is disabled we just use the first viewport/scissor - if(multiviewMask == (1U << (state.views.size())) - 1) + if(viewportPerView) { firstView = Bits::CountTrailingZeroes(multiviewMask); lastView = 31 - Bits::CountLeadingZeroes(multiviewMask); @@ -1652,10 +1701,15 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D }; vt->CmdBeginRenderPass(Unwrap(cmd), &rpbegin, VK_SUBPASS_CONTENTS_INLINE); + checkerPipe = m_Overlay.CreateTempViewportPipe(m_pDriver, lastView - firstView + 1); + for(uint32_t viewIndex = firstView; viewIndex <= lastView; viewIndex++) { VkViewport viewport = state.views[viewIndex]; - vt->CmdSetViewport(Unwrap(cmd), 0, 1, &viewport); + // set all viewports identically in case we're using the implicit-viewport extension + rdcarray allviews; + allviews.fill(state.views.count(), viewport); + vt->CmdSetViewport(Unwrap(cmd), 0, allviews.count(), allviews.data()); uint32_t uboOffs = 0; @@ -1729,7 +1783,8 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D viewport.width = scissor.z; viewport.height = scissor.w; - vt->CmdSetViewport(Unwrap(cmd), 0, 1, &viewport); + allviews.fill(state.views.count(), viewport); + vt->CmdSetViewport(Unwrap(cmd), 0, allviews.count(), allviews.data()); vt->CmdBindDescriptorSets(Unwrap(cmd), VK_PIPELINE_BIND_POINT_GRAPHICS, Unwrap(m_Overlay.m_CheckerPipeLayout), 0, 1, UnwrapPtr(m_Overlay.m_CheckerDescSet), 1, &uboOffs); @@ -3700,21 +3755,15 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D lastView = 31 - Bits::CountLeadingZeroes(multiviewMask); } - bool viewportPerView = false; - for(uint32_t view = firstView; view <= lastView; view++) { Vec4f *ubo = (Vec4f *)m_Overlay.m_TriSizeUBO.Map(&viewOffset[view]); if(!ubo) return ResourceId(); - // if we have multiview and _exactly_ as many viewports as multiview, assume a sane 1:1 - // mapping in reality this depends on shader execution to export ViewportIndex - // if multiview is disabled we just use the first viewport/scissor - if(multiviewMask == (1U << (state.views.size())) - 1) + if(viewportPerView) { *ubo = Vec4f(state.views[view].width, state.views[view].height, 0.0f, 0.0f); - viewportPerView = true; } else { diff --git a/renderdoc/driver/vulkan/vk_replay.h b/renderdoc/driver/vulkan/vk_replay.h index 7a6e144ad..052d4b915 100644 --- a/renderdoc/driver/vulkan/vk_replay.h +++ b/renderdoc/driver/vulkan/vk_replay.h @@ -713,7 +713,7 @@ private: void Init(WrappedVulkan *driver, VkDescriptorPool descriptorPool); void Destroy(WrappedVulkan *driver); - VkPipeline CreateTempViewportPipe(WrappedVulkan *driver); + VkPipeline CreateTempViewportPipe(WrappedVulkan *driver, uint32_t viewCount); VkPipeline CreateTempMultiviewQuadResolvePipe(WrappedVulkan *driver); VkDeviceMemory ImageMem = VK_NULL_HANDLE; diff --git a/renderdoc/driver/vulkan/vk_serialise.cpp b/renderdoc/driver/vulkan/vk_serialise.cpp index 48f775e56..9062e6055 100644 --- a/renderdoc/driver/vulkan/vk_serialise.cpp +++ b/renderdoc/driver/vulkan/vk_serialise.cpp @@ -1634,6 +1634,10 @@ SERIALISE_VK_HANDLES(); PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_PROPERTIES_KHR, \ VkPhysicalDeviceComputeShaderDerivativesPropertiesKHR) \ \ + /* VK_QCOM_multiview_per_view_viewports */ \ + PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM, \ + VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM) \ + \ /* VK_NV_dedicated_allocation */ \ PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEDICATED_ALLOCATION_MEMORY_ALLOCATE_INFO_NV, \ VkDedicatedAllocationMemoryAllocateInfoNV) \ @@ -2413,8 +2417,7 @@ SERIALISE_VK_HANDLES(); PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_RENDER_AREAS_FEATURES_QCOM) \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_MULTIVIEW_PER_VIEW_RENDER_AREAS_RENDER_PASS_BEGIN_INFO_QCOM) \ \ - /* VK_QCOM_multiview_per_view_viewports */ \ - PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM) \ + /* VK_QCOM_render_pass_transform */ \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_RENDER_PASS_TRANSFORM_INFO_QCOM) \ PNEXT_UNSUPPORTED(VK_STRUCTURE_TYPE_RENDER_PASS_TRANSFORM_BEGIN_INFO_QCOM) \ \ @@ -12925,6 +12928,22 @@ void Deserialise(const VkPhysicalDeviceCoherentMemoryFeaturesAMD &el) DeserialiseNext(el.pNext); } +template +void DoSerialise(SerialiserType &ser, VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM &el) +{ + RDCASSERT(ser.IsReading() || + el.sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM); + SerialiseNext(ser, el.sType, el.pNext); + + SERIALISE_MEMBER(multiviewPerViewViewports); +} + +template <> +void Deserialise(const VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM &el) +{ + DeserialiseNext(el.pNext); +} + template void DoSerialise(SerialiserType &ser, VkPhysicalDeviceComputeShaderDerivativesFeaturesKHR &el) { @@ -14858,6 +14877,7 @@ INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMeshShaderFeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMeshShaderPropertiesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMultisampledRenderToSingleSampledFeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMultiviewFeatures); +INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMultiviewProperties); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceMutableDescriptorTypeFeaturesEXT); INSTANTIATE_SERIALISE_TYPE(VkPhysicalDeviceNestedCommandBufferFeaturesEXT); diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index 61624456e..578955599 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -3641,6 +3641,15 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi CHECK_PHYS_EXT_FEATURE(hostImageCopy); } END_PHYS_EXT_CHECK(); + + BEGIN_PHYS_EXT_CHECK( + VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM); + { + CHECK_PHYS_EXT_FEATURE(multiviewPerViewViewports); + m_MultiviewPerViewViewports |= ext->multiviewPerViewViewports != VK_FALSE; + } + END_PHYS_EXT_CHECK(); } if(availFeatures.depthClamp)