From 16c11fd1a5b5d996556a3eb85a3f323889a78869 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Thu, 11 Jun 2015 16:41:29 -0600 Subject: vulkan.h: V100 -- Remove vkClearDescriptorSets, Bug# 13783 Conflicts: layers/draw_state.cpp --- include/vkLayer.h | 1 - include/vulkan.h | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'include') diff --git a/include/vkLayer.h b/include/vkLayer.h index 209a0880..bdbb8e9c 100644 --- a/include/vkLayer.h +++ b/include/vkLayer.h @@ -83,7 +83,6 @@ typedef struct VkLayerDispatchTable_ PFN_vkCreateDescriptorPool CreateDescriptorPool; PFN_vkResetDescriptorPool ResetDescriptorPool; PFN_vkAllocDescriptorSets AllocDescriptorSets; - PFN_vkClearDescriptorSets ClearDescriptorSets; PFN_vkUpdateDescriptorSets UpdateDescriptorSets; PFN_vkCreateDynamicViewportState CreateDynamicViewportState; PFN_vkCreateDynamicRasterState CreateDynamicRasterState; diff --git a/include/vulkan.h b/include/vulkan.h index 6ea3001c..995d7a49 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -33,7 +33,7 @@ #include "vk_platform.h" // Vulkan API version supported by this file -#define VK_API_VERSION VK_MAKE_VERSION(0, 99, 0) +#define VK_API_VERSION VK_MAKE_VERSION(0, 100, 0) #ifdef __cplusplus extern "C" @@ -2124,7 +2124,6 @@ typedef VkResult (VKAPI *PFN_vkCreateDescriptorSetLayout)(VkDevice device, const typedef VkResult (VKAPI *PFN_vkCreateDescriptorPool)(VkDevice device, VkDescriptorPoolUsage poolUsage, uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool); typedef VkResult (VKAPI *PFN_vkResetDescriptorPool)(VkDevice device, VkDescriptorPool descriptorPool); typedef VkResult (VKAPI *PFN_vkAllocDescriptorSets)(VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorSetUsage setUsage, uint32_t count, const VkDescriptorSetLayout* pSetLayouts, VkDescriptorSet* pDescriptorSets, uint32_t* pCount); -typedef void (VKAPI *PFN_vkClearDescriptorSets)(VkDevice device, VkDescriptorPool descriptorPool, uint32_t count, const VkDescriptorSet* pDescriptorSets); typedef VkResult (VKAPI *PFN_vkUpdateDescriptorSets)(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies); typedef VkResult (VKAPI *PFN_vkCreateDynamicViewportState)(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, VkDynamicVpState* pState); typedef VkResult (VKAPI *PFN_vkCreateDynamicRasterState)(VkDevice device, const VkDynamicRsStateCreateInfo* pCreateInfo, VkDynamicRsState* pState); @@ -2559,12 +2558,6 @@ VkResult VKAPI vkAllocDescriptorSets( VkDescriptorSet* pDescriptorSets, uint32_t* pCount); -void VKAPI vkClearDescriptorSets( - VkDevice device, - VkDescriptorPool descriptorPool, - uint32_t count, - const VkDescriptorSet* pDescriptorSets); - VkResult VKAPI vkUpdateDescriptorSets( VkDevice device, uint32_t writeCount, -- cgit v1.2.3