Skip to content

Add QCOM Multiview Per View Viewport extension support #2086

Add QCOM Multiview Per View Viewport extension support

Add QCOM Multiview Per View Viewport extension support #2086

Triggered via pull request December 22, 2023 02:40
Status Failure
Total duration 1m 26s
Artifacts

ci.yml

on: pull_request
Commit message check
9s
Commit message check
Code formatting check
57s
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_rendertexture.cpp b/renderdoc/driver/vulkan/vk_rendertexture.cpp index 9cc3381..d62b17d 100644 --- a/renderdoc/driver/vulkan/vk_rendertexture.cpp +++ b/renderdoc/driver/vulkan/vk_rendertexture.cpp @@ -575,7 +575,7 @@ bool VulkanReplay::RenderTextureInternal(TextureDisplay cfg, const ImageState &i vt->CmdBindDescriptorSets(Unwrap(cmd), VK_PIPELINE_BIND_POINT_GRAPHICS, Unwrap(m_TexRender.PipeLayout), 0, 1, UnwrapPtr(descset), 2, offsets); - VulkanRenderState& state = m_pDriver->m_RenderState; + VulkanRenderState &state = m_pDriver->m_RenderState; vt->CmdSetViewport(Unwrap(cmd), 0, (uint32_t)state.views.size(), state.views.data()); vt->CmdDraw(Unwrap(cmd), 4, 1, 0, 0); diff --git a/renderdoc/driver/vulkan/vk_serialise.cpp b/renderdoc/driver/vulkan/vk_serialise.cpp index 40c83ab..6c526cb 100644 --- a/renderdoc/driver/vulkan/vk_serialise.cpp +++ b/renderdoc/driver/vulkan/vk_serialise.cpp @@ -6435,19 +6435,19 @@ void Deserialise(const VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM &e } template <typename SerialiserType> -void DoSerialise(SerialiserType& ser, VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM& el) +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); + 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); + SERIALISE_MEMBER(multiviewPerViewViewports); } template <> -void Deserialise(const VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM& el) +void Deserialise(const VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM &el) { - DeserialiseNext(el.pNext); + DeserialiseNext(el.pNext); } template <typename SerialiserType> diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index c383e79..d2386c8 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -1918,11 +1918,12 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } bool multiviewperviewviewports = false; - if (supportedExtensions.find(VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_EXTENSION_NAME) != supportedExtensions.end()) + if(supportedExtensions.find(VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_EXTENSION_NAME) != + supportedExtensions.end()) { - multiviewperviewviewports = true; - Extensions.push_back(VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_EXTENSION_NAME); - RDCLOG("Enabling VK_QCOM_multiview_per_view_viewports"); + multiviewperviewviewports = true; + Extensions.push_back(VK_QCOM_MULTIVIEW_PER_VIEW_VIEWPORTS_EXTENSION_NAME); + RDCLOG("Enabling VK_QCOM_multiview_per_view_viewports"); } VkDevice device; @@ -2518,7 +2519,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM); { - CHECK_PHYS_EXT_FEATURE(multiviewPerViewViewports); + CHECK_PHYS_EXT_FEATURE(multiviewPerViewViewports); } END_PHYS_EXT_CHECK(); @@ -3577,31 +3578,33 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi } } - VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM mvpvvFeature = - { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_VIEWPORTS_FEATURES_QCOM }; + VkPhysicalDeviceMultiviewPerViewViewportsFeaturesQCOM mvpvvFeature = { + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VI
Code formatting check
Process completed with exit code 1.