From 1c95ea15e4acb07e87781f212ffbf9dc47c9817f Mon Sep 17 00:00:00 2001 From: John Anthony Date: Thu, 23 Aug 2018 16:11:13 +0200 Subject: [PATCH] Incorrect enum values for VK_KHR_create_renderpass2 Some VkStructureType enum values added for VK_KHR_create_renderpass2 are not in accordance with current Vulkan headers and the Vulkan specification. Components: Vulkan VK-GL-CTS issue: 1321 Affects: dEQP-VK.*renderpass2.* Change-Id: I51031d538bc427e56bbf56f603f200b513834d67 --- external/vulkancts/framework/vulkan/vkBasicTypes.inl | 4 ++-- external/vulkancts/scripts/src/vulkan.h.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/external/vulkancts/framework/vulkan/vkBasicTypes.inl b/external/vulkancts/framework/vulkan/vkBasicTypes.inl index c2a9d51..0712058 100644 --- a/external/vulkancts/framework/vulkan/vkBasicTypes.inl +++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl @@ -288,8 +288,8 @@ enum VkStructureType VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2_KHR = 1000109002, VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2_KHR = 1000109003, VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR = 1000109004, - VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO_KHR = 1000109006, - VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR = 1000109007, + VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO_KHR = 1000109005, + VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR = 1000109006, VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR = 1000111000, VK_STRUCTURE_TYPE_IMPORT_FENCE_WIN32_HANDLE_INFO_KHR = 1000114000, VK_STRUCTURE_TYPE_EXPORT_FENCE_WIN32_HANDLE_INFO_KHR = 1000114001, diff --git a/external/vulkancts/scripts/src/vulkan.h.in b/external/vulkancts/scripts/src/vulkan.h.in index 2ef8131..15eefdc 100644 --- a/external/vulkancts/scripts/src/vulkan.h.in +++ b/external/vulkancts/scripts/src/vulkan.h.in @@ -347,8 +347,8 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_2_KHR = 1000109002, VK_STRUCTURE_TYPE_SUBPASS_DEPENDENCY_2_KHR = 1000109003, VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO_2_KHR = 1000109004, - VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO_KHR = 1000109006, - VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR = 1000109007, + VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO_KHR = 1000109005, + VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR = 1000109006, VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR = 1000111000, VK_STRUCTURE_TYPE_IMPORT_FENCE_WIN32_HANDLE_INFO_KHR = 1000114000, VK_STRUCTURE_TYPE_EXPORT_FENCE_WIN32_HANDLE_INFO_KHR = 1000114001, -- 2.7.4