From ccb27a002ca133084806607542aec473c41fd16e Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Wed, 8 Jul 2015 12:53:49 -0700 Subject: [PATCH] vk/0.130 Update VkObjectType values Don't import any new enum tokens from the 0.130 header. Just update the values of existing enums. This reduces the diff by about 16 lines. --- include/vulkan/vulkan.h | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index d21d5a1be54..fd57e1ad22a 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -440,25 +440,24 @@ typedef enum { VK_OBJECT_TYPE_IMAGE_VIEW = 9, VK_OBJECT_TYPE_COLOR_ATTACHMENT_VIEW = 10, VK_OBJECT_TYPE_DEPTH_STENCIL_VIEW = 11, - VK_OBJECT_TYPE_SHADER = 12, - VK_OBJECT_TYPE_PIPELINE = 13, - VK_OBJECT_TYPE_PIPELINE_LAYOUT = 14, - VK_OBJECT_TYPE_SAMPLER = 15, - VK_OBJECT_TYPE_DESCRIPTOR_SET = 16, - VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT = 17, - VK_OBJECT_TYPE_DESCRIPTOR_POOL = 18, - VK_OBJECT_TYPE_DYNAMIC_VP_STATE = 19, - VK_OBJECT_TYPE_DYNAMIC_RS_STATE = 20, - VK_OBJECT_TYPE_DYNAMIC_CB_STATE = 21, - VK_OBJECT_TYPE_DYNAMIC_DS_STATE = 22, - VK_OBJECT_TYPE_FENCE = 23, - VK_OBJECT_TYPE_SEMAPHORE = 24, - VK_OBJECT_TYPE_EVENT = 25, - VK_OBJECT_TYPE_QUERY_POOL = 26, - VK_OBJECT_TYPE_FRAMEBUFFER = 27, - VK_OBJECT_TYPE_RENDER_PASS = 28, - - // Valid ranges for core Vulkan: + + VK_OBJECT_TYPE_SHADER = 13, + VK_OBJECT_TYPE_PIPELINE = 14, + VK_OBJECT_TYPE_PIPELINE_LAYOUT = 15, + VK_OBJECT_TYPE_SAMPLER = 16, + VK_OBJECT_TYPE_DESCRIPTOR_SET = 17, + VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT = 18, + VK_OBJECT_TYPE_DESCRIPTOR_POOL = 19, + VK_OBJECT_TYPE_DYNAMIC_VP_STATE = 20, + VK_OBJECT_TYPE_DYNAMIC_RS_STATE = 21, + VK_OBJECT_TYPE_DYNAMIC_CB_STATE = 22, + VK_OBJECT_TYPE_DYNAMIC_DS_STATE = 23, + VK_OBJECT_TYPE_FENCE = 24, + VK_OBJECT_TYPE_SEMAPHORE = 25, + VK_OBJECT_TYPE_EVENT = 26, + VK_OBJECT_TYPE_QUERY_POOL = 27, + VK_OBJECT_TYPE_FRAMEBUFFER = 28, + VK_OBJECT_TYPE_RENDER_PASS = 29, VK_OBJECT_TYPE_BEGIN_RANGE = VK_OBJECT_TYPE_INSTANCE, VK_OBJECT_TYPE_END_RANGE = VK_OBJECT_TYPE_RENDER_PASS, VK_NUM_OBJECT_TYPE = (VK_OBJECT_TYPE_END_RANGE - VK_OBJECT_TYPE_BEGIN_RANGE + 1), -- 2.30.2