diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-05-25 16:27:50 +0800 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2015-06-02 09:37:44 -0500 |
| commit | 08cb58fea610f58dedaad1544b3b922be733b24d (patch) | |
| tree | 89661dde2d87bfd4500e9421289a7525e4218a28 /include | |
| parent | 6d29a412f24aeb945f537c0b47a0dd7cf3a24a07 (diff) | |
| download | usermoji-08cb58fea610f58dedaad1544b3b922be733b24d.tar.xz | |
v98: remove vk{Begin,End}DescriptorPoolUpdate()
Assume VK_DESCRIPTOR_UPDATE_MODE_FASTEST.
Conflicts:
icd/intel/desc.c
include/vulkan.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/vkLayer.h | 2 | ||||
| -rw-r--r-- | include/vulkan.h | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/include/vkLayer.h b/include/vkLayer.h index 7239ba55..e19b7067 100644 --- a/include/vkLayer.h +++ b/include/vkLayer.h @@ -89,8 +89,6 @@ typedef struct VkLayerDispatchTable_ PFN_vkCreatePipelineLayout CreatePipelineLayout; PFN_vkCreateSampler CreateSampler; PFN_vkCreateDescriptorSetLayout CreateDescriptorSetLayout; - PFN_vkBeginDescriptorPoolUpdate BeginDescriptorPoolUpdate; - PFN_vkEndDescriptorPoolUpdate EndDescriptorPoolUpdate; PFN_vkCreateDescriptorPool CreateDescriptorPool; PFN_vkResetDescriptorPool ResetDescriptorPool; PFN_vkAllocDescriptorSets AllocDescriptorSets; diff --git a/include/vulkan.h b/include/vulkan.h index 0a39d18b..30d2fb77 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, 97, 1) +#define VK_API_VERSION VK_MAKE_VERSION(0, 97, 2) #ifdef __cplusplus extern "C" @@ -280,14 +280,6 @@ typedef enum VkDescriptorPoolUsage_ VK_ENUM_RANGE(DESCRIPTOR_POOL_USAGE, ONE_SHOT, DYNAMIC) } VkDescriptorPoolUsage; -typedef enum VkDescriptorUpdateMode_ -{ - VK_DESCRIPTOR_UPDATE_MODE_COPY = 0x00000000, - VK_DESCRIPTOR_UPDATE_MODE_FASTEST = 0x00000001, - - VK_ENUM_RANGE(DESCRIPTOR_UPDATE_MODE, COPY, FASTEST) -} VkDescriptorUpdateMode; - typedef enum VkDescriptorSetUsage_ { VK_DESCRIPTOR_SET_USAGE_ONE_SHOT = 0x00000000, @@ -2194,8 +2186,6 @@ typedef VkResult (VKAPI *PFN_vkLoadPipelineDerivative)(VkDevice device, size_t d typedef VkResult (VKAPI *PFN_vkCreatePipelineLayout)(VkDevice device, const VkPipelineLayoutCreateInfo* pCreateInfo, VkPipelineLayout* pPipelineLayout); typedef VkResult (VKAPI *PFN_vkCreateSampler)(VkDevice device, const VkSamplerCreateInfo* pCreateInfo, VkSampler* pSampler); typedef VkResult (VKAPI *PFN_vkCreateDescriptorSetLayout)(VkDevice device, const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayout* pSetLayout); -typedef VkResult (VKAPI *PFN_vkBeginDescriptorPoolUpdate)(VkDevice device, VkDescriptorUpdateMode updateMode); -typedef VkResult (VKAPI *PFN_vkEndDescriptorPoolUpdate)(VkDevice device, VkCmdBuffer cmd); 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); @@ -2634,14 +2624,6 @@ VkResult VKAPI vkCreateDescriptorSetLayout( const VkDescriptorSetLayoutCreateInfo* pCreateInfo, VkDescriptorSetLayout* pSetLayout); -VkResult VKAPI vkBeginDescriptorPoolUpdate( - VkDevice device, - VkDescriptorUpdateMode updateMode); - -VkResult VKAPI vkEndDescriptorPoolUpdate( - VkDevice device, - VkCmdBuffer cmd); - VkResult VKAPI vkCreateDescriptorPool( VkDevice device, VkDescriptorPoolUsage poolUsage, |