add VK_KHR_maintenance5 support #2283
ci.yml
on: pull_request
Baseline cmake check
0s
Documentation Build
0s
Android
0s
Matrix: Linux
Matrix: Mac
Matrix: Windows
Annotations
2 errors and 2 warnings
Code formatting check
clang-format issues were found. See CONTRIBUTING.md for more information.
diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h
index 1b56b0d..caa4192 100644
--- a/renderdoc/driver/vulkan/vk_common.h
+++ b/renderdoc/driver/vulkan/vk_common.h
@@ -1472,10 +1472,10 @@ DECLARE_REFLECTION_STRUCT(VkWriteDescriptorSetAccelerationStructureKHR);
DECLARE_REFLECTION_STRUCT(VkWriteDescriptorSetInlineUniformBlock);
DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMaintenance5FeaturesKHR);
DECLARE_REFLECTION_STRUCT(VkPhysicalDeviceMaintenance5PropertiesKHR);
-DECLARE_REFLECTION_STRUCT(VkRenderingAreaInfoKHR);
-DECLARE_REFLECTION_STRUCT(VkDeviceImageSubresourceInfoKHR);
-DECLARE_REFLECTION_STRUCT(VkPipelineCreateFlags2CreateInfoKHR);
-DECLARE_REFLECTION_STRUCT(VkBufferUsageFlags2CreateInfoKHR);
+DECLARE_REFLECTION_STRUCT(VkRenderingAreaInfoKHR);
+DECLARE_REFLECTION_STRUCT(VkDeviceImageSubresourceInfoKHR);
+DECLARE_REFLECTION_STRUCT(VkPipelineCreateFlags2CreateInfoKHR);
+DECLARE_REFLECTION_STRUCT(VkBufferUsageFlags2CreateInfoKHR);
DECLARE_REFLECTION_STRUCT(VkImageSubresource2KHR);
DECLARE_DESERIALISE_TYPE(VkAccelerationStructureBuildGeometryInfoKHR);
@@ -1905,10 +1905,10 @@ DECLARE_DESERIALISE_TYPE(VkWriteDescriptorSetAccelerationStructureKHR);
DECLARE_DESERIALISE_TYPE(VkWriteDescriptorSetInlineUniformBlock);
DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMaintenance5FeaturesKHR);
DECLARE_DESERIALISE_TYPE(VkPhysicalDeviceMaintenance5PropertiesKHR);
-DECLARE_DESERIALISE_TYPE(VkRenderingAreaInfoKHR);
-DECLARE_DESERIALISE_TYPE(VkDeviceImageSubresourceInfoKHR);
-DECLARE_DESERIALISE_TYPE(VkPipelineCreateFlags2CreateInfoKHR);
-DECLARE_DESERIALISE_TYPE(VkBufferUsageFlags2CreateInfoKHR);
+DECLARE_DESERIALISE_TYPE(VkRenderingAreaInfoKHR);
+DECLARE_DESERIALISE_TYPE(VkDeviceImageSubresourceInfoKHR);
+DECLARE_DESERIALISE_TYPE(VkPipelineCreateFlags2CreateInfoKHR);
+DECLARE_DESERIALISE_TYPE(VkBufferUsageFlags2CreateInfoKHR);
DECLARE_DESERIALISE_TYPE(VkImageSubresource2KHR);
// plain structs with no next chain
diff --git a/renderdoc/driver/vulkan/vk_serialise.cpp b/renderdoc/driver/vulkan/vk_serialise.cpp
index ddd5644..31e4544 100644
--- a/renderdoc/driver/vulkan/vk_serialise.cpp
+++ b/renderdoc/driver/vulkan/vk_serialise.cpp
@@ -1446,14 +1446,16 @@ SERIALISE_VK_HANDLES();
VkSubpassFragmentDensityMapOffsetEndInfoQCOM) \
\
/* VK_KHR_maintenance5 */ \
- PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR, \
- VkPhysicalDeviceMaintenance5FeaturesKHR) \
- PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR, \
- VkPhysicalDeviceMaintenance5PropertiesKHR) \
- PNEXT_STRUCT(VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR, VkRenderingAreaInfoKHR) \
- PNEXT_STRUCT(VK_STRUCTURE_TYPE_DEVICE_IMAGE_SUBRESOURCE_INFO_KHR, VkDeviceImageSubresourceInfoKHR) \
- PNEXT_STRUCT(VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR, VkPipelineCreateFlags2CreateInfoKHR) \
- PNEXT_STRUCT(VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR, VkBufferUsageFlags2CreateInfoKHR) \
+ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR, \
+ VkPhysicalDeviceMaintenance5FeaturesKHR) \
+ PNEXT_STRUCT(VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR, \
+ VkPhysicalDeviceMaintenance5PropertiesKHR) \
+ PNEXT_STRUCT(VK_STRUCTURE_TYPE_RENDERING_AREA_INFO_KHR, VkRenderingAreaInfoKHR)
|
Code formatting check
Process completed with exit code 1.
|
Commit message check
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
|
Code formatting check
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
|