v98: remove vk{Begin,End}DescriptorPoolUpdate()

Assume VK_DESCRIPTOR_UPDATE_MODE_FASTEST.

Conflicts:
	icd/intel/desc.c
	include/vulkan.h

14 files changed, 5 insertions, 212 deletions

diff --git a/demos/cube.c b/demos/cube.c
index 992251d8..171ec1ae 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1548,13 +1548,8 @@ static void demo_prepare_descriptor_set(struct demo *demo)
             &demo->desc_set, &count);
     assert(!err && count == 1);
 
-    vkBeginDescriptorPoolUpdate(demo->device,
-            VK_DESCRIPTOR_UPDATE_MODE_FASTEST);
-
     vkClearDescriptorSets(demo->device, demo->desc_pool, 1, &demo->desc_set);
     vkUpdateDescriptors(demo->device, demo->desc_set, 2, update_array);
-
-    vkEndDescriptorPoolUpdate(demo->device, demo->buffers[demo->current_buffer].cmd);
 }
 
 static void demo_prepare(struct demo *demo)
diff --git a/demos/tri.c b/demos/tri.c
index d8264a1f..6260e281 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1100,13 +1100,8 @@ static void demo_prepare_descriptor_set(struct demo *demo)
             &demo->desc_set, &count);
     assert(!err && count == 1);
 
-    vkBeginDescriptorPoolUpdate(demo->device,
-            VK_DESCRIPTOR_UPDATE_MODE_FASTEST);
-
     vkClearDescriptorSets(demo->device, demo->desc_pool, 1, &demo->desc_set);
     vkUpdateDescriptors(demo->device, demo->desc_set, 1, update_array);
-
-    vkEndDescriptorPoolUpdate(demo->device, demo->draw_cmd);
 }
 
 static void demo_prepare(struct demo *demo)
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 6da37fa2..c67dd83d 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -2206,22 +2206,6 @@ ICD_EXPORT VkResult VKAPI  vkCreatePipelineLayout(
             (struct nulldrv_pipeline_layout **) pPipelineLayout);
 }
 
-ICD_EXPORT VkResult VKAPI vkBeginDescriptorPoolUpdate(
-    VkDevice                                   device,
-    VkDescriptorUpdateMode                   updateMode)
-{
-    NULLDRV_LOG_FUNC;
-    return VK_SUCCESS;
-}
-
-ICD_EXPORT VkResult VKAPI vkEndDescriptorPoolUpdate(
-    VkDevice                                   device,
-    VkCmdBuffer                               cmd_)
-{
-    NULLDRV_LOG_FUNC;
-    return VK_SUCCESS;
-}
-
 ICD_EXPORT VkResult VKAPI vkCreateDescriptorPool(
     VkDevice                                   device,
     VkDescriptorPoolUsage                  poolUsage,
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,
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 28951327..d90b1ee0 100755
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -562,20 +562,6 @@ static SET_NODE* getSetNode(VkDescriptorSet set)
     return setMap[set];
 }
 
-// Return VK_TRUE if DS Exists and is within an vkBeginDescriptorPoolUpdate() call sequence, otherwise VK_FALSE
-static bool32_t dsUpdateActive(VkDescriptorSet ds)
-{
-    // Note, both "get" functions use global mutex so this guy does not
-    SET_NODE* pTrav = getSetNode(ds);
-    if (pTrav) {
-        POOL_NODE* pPool = getPoolNode(pTrav->pool);
-        if (pPool) {
-            return pPool->updateActive;
-        }
-    }
-    return VK_FALSE;
-}
-
 static LAYOUT_NODE* getLayoutNode(const VkDescriptorSetLayout layout) {
     loader_platform_thread_lock_mutex(&globalLock);
     if (layoutMap.find(layout) == layoutMap.end()) {
@@ -1616,14 +1602,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkQueueSubmit(VkQueue queue, uint32_t cmdBufferCo
             return VK_ERROR_UNKNOWN;
         }
         loader_platform_thread_unlock_mutex(&globalLock);
-        for (auto ii=pCB->boundDescriptorSets.begin(); ii != pCB->boundDescriptorSets.end(); ++ii) {
-            if (dsUpdateActive(*ii)) {
-                char str[1024];
-                sprintf(str, "You must call vkEndDescriptorPoolUpdate() before this call to vkQueueSubmit()!");
-                layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, *ii, 0, DRAWSTATE_BINDING_DS_NO_END_UPDATE, "DS", str);
-                return VK_ERROR_UNKNOWN;
-            }
-        }
     }
     VkResult result = nextTable.QueueSubmit(queue, cmdBufferCount, pCmdBuffers, fence);
     return result;
@@ -1776,56 +1754,6 @@ VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkPipelineLayoutCre
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkBeginDescriptorPoolUpdate(VkDevice device, VkDescriptorUpdateMode updateMode)
-{
-    VkResult result = nextTable.BeginDescriptorPoolUpdate(device, updateMode);
-    if (VK_SUCCESS == result) {
-        loader_platform_thread_lock_mutex(&globalLock);
-        POOL_NODE* pPoolNode = poolMap.begin()->second;
-        if (!pPoolNode) {
-            char str[1024];
-            sprintf(str, "Unable to find pool node");
-            layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_INTERNAL_ERROR, "DS", str);
-        }
-        else {
-            pPoolNode->updateActive = 1;
-        }
-        loader_platform_thread_unlock_mutex(&globalLock);
-    }
-    return result;
-}
-
-VK_LAYER_EXPORT VkResult VKAPI vkEndDescriptorPoolUpdate(VkDevice device, VkCmdBuffer cmd)
-{
-    // Perform some initial validation checks
-    POOL_NODE* pPoolNode = NULL;
-    loader_platform_thread_lock_mutex(&globalLock);
-    auto poolEntry = poolMap.begin();
-    if (poolEntry == poolMap.end()) {
-        char str[1024];
-        sprintf(str, "Unable to find pool node");
-        layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_INTERNAL_ERROR, "DS", str);
-        loader_platform_thread_unlock_mutex(&globalLock);
-        return VK_ERROR_UNKNOWN;
-    }
-    else {
-        pPoolNode = poolEntry->second;
-        if (!pPoolNode->updateActive) {
-            char str[1024];
-            sprintf(str, "You must call vkBeginDescriptorPoolUpdate() before this call to vkEndDescriptorPoolUpdate()!");
-            layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, NULL, 0, DRAWSTATE_DS_END_WITHOUT_BEGIN, "DS", str);
-            loader_platform_thread_unlock_mutex(&globalLock);
-            return VK_ERROR_UNKNOWN;
-        }
-    }
-    loader_platform_thread_unlock_mutex(&globalLock);
-    VkResult result = nextTable.EndDescriptorPoolUpdate(device, cmd);
-    if (VK_SUCCESS == result) {
-        pPoolNode->updateActive = 0;
-    }
-    return result;
-}
-
 VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, VkDescriptorPoolUsage poolUsage, uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool)
 {
     VkResult result = nextTable.CreateDescriptorPool(device, poolUsage, maxSets, pCreateInfo, pDescriptorPool);
@@ -1851,7 +1779,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, VkDescrip
                 memcpy((void*)pNewNode->createInfo.pTypeCount, pCreateInfo->pTypeCount, typeCountSize);
             }
             pNewNode->poolUsage  = poolUsage;
-            pNewNode->updateActive = 0;
             pNewNode->maxSets      = maxSets;
             pNewNode->pool       = *pDescriptorPool;
             poolMap[*pDescriptorPool] = pNewNode;
@@ -1935,16 +1862,10 @@ VK_LAYER_EXPORT void VKAPI vkClearDescriptorSets(VkDevice device, VkDescriptorPo
 VK_LAYER_EXPORT void VKAPI vkUpdateDescriptors(VkDevice device, VkDescriptorSet descriptorSet, uint32_t updateCount, const void** ppUpdateArray)
 {
     SET_NODE* pSet = getSetNode(descriptorSet);
-    if (!dsUpdateActive(descriptorSet)) {
-        char str[1024];
-        sprintf(str, "You must call vkBeginDescriptorPoolUpdate() before this call to vkUpdateDescriptors()!");
-        layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, descriptorSet, 0, DRAWSTATE_UPDATE_WITHOUT_BEGIN, "DS", str);
-    }
-    else {
-        // pUpdateChain is an array of VK_UPDATE_* struct ptrs defining the mappings for the descriptors
-        if (dsUpdate(descriptorSet, updateCount, ppUpdateArray)) {
-            nextTable.UpdateDescriptors(device, descriptorSet, updateCount, ppUpdateArray);
-        }
+
+    // pUpdateChain is an array of VK_UPDATE_* struct ptrs defining the mappings for the descriptors
+    if (dsUpdate(descriptorSet, updateCount, ppUpdateArray)) {
+        nextTable.UpdateDescriptors(device, descriptorSet, updateCount, ppUpdateArray);
     }
 }
 
@@ -2832,10 +2753,6 @@ VK_LAYER_EXPORT void* VKAPI vkGetProcAddr(VkPhysicalDevice gpu, const char* func
         return (void*) vkCreateDescriptorSetLayout;
     if (!strcmp(funcName, "vkCreatePipelineLayout"))
         return (void*) vkCreatePipelineLayout;
-    if (!strcmp(funcName, "vkBeginDescriptorPoolUpdate"))
-        return (void*) vkBeginDescriptorPoolUpdate;
-    if (!strcmp(funcName, "vkEndDescriptorPoolUpdate"))
-        return (void*) vkEndDescriptorPoolUpdate;
     if (!strcmp(funcName, "vkCreateDescriptorPool"))
         return (void*) vkCreateDescriptorPool;
     if (!strcmp(funcName, "vkResetDescriptorPool"))
diff --git a/layers/draw_state.h b/layers/draw_state.h
index b866503b..1915e713 100644
--- a/layers/draw_state.h
+++ b/layers/draw_state.h
@@ -35,14 +35,11 @@ typedef enum _DRAW_STATE_ERROR
     DRAWSTATE_INVALID_POOL,                     // Invalid DS pool
     DRAWSTATE_INVALID_SET,                      // Invalid DS
     DRAWSTATE_INVALID_LAYOUT,                   // Invalid DS layout
-    DRAWSTATE_DS_END_WITHOUT_BEGIN,             // EndDSUpdate called w/o corresponding BeginDSUpdate
-    DRAWSTATE_UPDATE_WITHOUT_BEGIN,             // Attempt to update descriptors w/o calling BeginDescriptorPoolUpdate
     DRAWSTATE_INVALID_PIPELINE,                 // Invalid Pipeline referenced
     DRAWSTATE_INVALID_CMD_BUFFER,               // Invalid CmdBuffer referenced
     DRAWSTATE_VTX_INDEX_OUT_OF_BOUNDS,          // binding in vkCmdBindVertexData() too large for PSO's pVertexBindingDescriptions array
     DRAWSTATE_INVALID_DYNAMIC_STATE_OBJECT,     // Invalid dyn state object
     DRAWSTATE_MISSING_DOT_PROGRAM,              // No "dot" program in order to generate png image
-    DRAWSTATE_BINDING_DS_NO_END_UPDATE,         // DS bound to CmdBuffer w/o call to vkEndDescriptorSetUpdate())
     DRAWSTATE_OUT_OF_MEMORY,                    // malloc failed
     DRAWSTATE_DESCRIPTOR_TYPE_MISMATCH,         // Type in layout vs. update are not the same
     DRAWSTATE_DESCRIPTOR_UPDATE_OUT_OF_BOUNDS,  // Descriptors set for update out of bounds for corresponding layout section
@@ -157,7 +154,6 @@ typedef struct _POOL_NODE {
     VkDescriptorPoolUsage                    poolUsage;
     uint32_t                                     maxSets;
     VkDescriptorPoolCreateInfo              createInfo;
-    bool32_t                                     updateActive; // Track if Pool is in an update block
     SET_NODE*                                    pSets; // Head of LL of sets for this Pool
 } POOL_NODE;
 
diff --git a/layers/glave_snapshot.c b/layers/glave_snapshot.c
index 150821a9..1c15544a 100644
--- a/layers/glave_snapshot.c
+++ b/layers/glave_snapshot.c
@@ -1093,24 +1093,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout( VkDevice device, con
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkBeginDescriptorPoolUpdate(VkDevice device, VkDescriptorUpdateMode updateMode)
-{
-    loader_platform_thread_lock_mutex(&objLock);
-    ll_increment_use_count((void*)device, VK_OBJECT_TYPE_DEVICE);
-    loader_platform_thread_unlock_mutex(&objLock);
-    VkResult result = nextTable.BeginDescriptorPoolUpdate(device, updateMode);
-    return result;
-}
-
-VK_LAYER_EXPORT VkResult VKAPI vkEndDescriptorPoolUpdate(VkDevice device, VkCmdBuffer cmd)
-{
-    loader_platform_thread_lock_mutex(&objLock);
-    ll_increment_use_count((void*)device, VK_OBJECT_TYPE_DEVICE);
-    loader_platform_thread_unlock_mutex(&objLock);
-    VkResult result = nextTable.EndDescriptorPoolUpdate(device, cmd);
-    return result;
-}
-
 VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, VkDescriptorPoolUsage poolUsage, uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool)
 {
     loader_platform_thread_lock_mutex(&objLock);
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 7e12283a..2ee5d784 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -991,24 +991,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkCreatePipelineLayout(VkDevice device, const VkP
     return result;
 }
 
-VK_LAYER_EXPORT VkResult VKAPI vkBeginDescriptorPoolUpdate(VkDevice device, VkDescriptorUpdateMode updateMode)
-{
-    char str[1024];
-    if (!validate_VkDescriptorUpdateMode(updateMode)) {
-        sprintf(str, "Parameter updateMode to function BeginDescriptorPoolUpdate has invalid value of %i.", (int)updateMode);
-        layerCbMsg(VK_DBG_MSG_ERROR, VK_VALIDATION_LEVEL_0, NULL, 0, 1, "PARAMCHECK", str);
-    }
-    VkResult result = nextTable.BeginDescriptorPoolUpdate(device, updateMode);
-    return result;
-}
-
-VK_LAYER_EXPORT VkResult VKAPI vkEndDescriptorPoolUpdate(VkDevice device, VkCmdBuffer cmd)
-{
-
-    VkResult result = nextTable.EndDescriptorPoolUpdate(device, cmd);
-    return result;
-}
-
 VK_LAYER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, VkDescriptorPoolUsage poolUsage, uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool)
 {
     char str[1024];
diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 28bb9e3b..28c10cfb 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -158,10 +158,6 @@ static inline void* globalGetProcAddr(const char *name)
         return (void*) vkCreateSampler;
     if (!strcmp(name, "CreateDescriptorSetLayout"))
         return (void*) vkCreateDescriptorSetLayout;
-    if (!strcmp(name, "BeginDescriptorPoolUpdate"))
-        return (void*) vkBeginDescriptorPoolUpdate;
-    if (!strcmp(name, "EndDescriptorPoolUpdate"))
-        return (void*) vkEndDescriptorPoolUpdate;
     if (!strcmp(name, "CreateDescriptorPool"))
         return (void*) vkCreateDescriptorPool;
     if (!strcmp(name, "ResetDescriptorPool"))
diff --git a/loader/table_ops.h b/loader/table_ops.h
index 1e2a99fb..49107bb8 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -95,8 +95,6 @@ static inline void loader_initialize_dispatch_table(VkLayerDispatchTable *table,
     table->CreatePipelineLayout = (PFN_vkCreatePipelineLayout) gpa(gpu, "vkCreatePipelineLayout");
     table->CreateSampler = (PFN_vkCreateSampler) gpa(gpu, "vkCreateSampler");
     table->CreateDescriptorSetLayout = (PFN_vkCreateDescriptorSetLayout) gpa(gpu, "vkCreateDescriptorSetLayout");
-    table->BeginDescriptorPoolUpdate = (PFN_vkBeginDescriptorPoolUpdate) gpa(gpu, "vkBeginDescriptorPoolUpdate");
-    table->EndDescriptorPoolUpdate = (PFN_vkEndDescriptorPoolUpdate) gpa(gpu, "vkEndDescriptorPoolUpdate");
     table->CreateDescriptorPool = (PFN_vkCreateDescriptorPool) gpa(gpu, "vkCreateDescriptorPool");
     table->ResetDescriptorPool = (PFN_vkResetDescriptorPool) gpa(gpu, "vkResetDescriptorPool");
     table->AllocDescriptorSets = (PFN_vkAllocDescriptorSets) gpa(gpu, "vkAllocDescriptorSets");
@@ -294,10 +292,6 @@ static inline void *loader_lookup_dispatch_table(const VkLayerDispatchTable *tab
         return (void *) table->CreateSampler;
     if (!strcmp(name, "CreateDescriptorSetLayout"))
         return (void *) table->CreateDescriptorSetLayout;
-    if (!strcmp(name, "BeginDescriptorPoolUpdate"))
-        return (void *) table->BeginDescriptorPoolUpdate;
-    if (!strcmp(name, "EndDescriptorPoolUpdate"))
-        return (void *) table->EndDescriptorPoolUpdate;
     if (!strcmp(name, "CreateDescriptorPool"))
         return (void *) table->CreateDescriptorPool;
     if (!strcmp(name, "ResetDescriptorPool"))
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 136fe1ae..d07be991 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -566,24 +566,6 @@ LOADER_EXPORT VkResult VKAPI vkCreateDescriptorSetLayout(VkDevice device, const
     return disp->CreateDescriptorSetLayout(device, pCreateInfo, pSetLayout);
 }
 
-LOADER_EXPORT VkResult VKAPI vkBeginDescriptorPoolUpdate(VkDevice device, VkDescriptorUpdateMode updateMode)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(device);
-
-    return disp->BeginDescriptorPoolUpdate(device, updateMode);
-}
-
-LOADER_EXPORT VkResult VKAPI vkEndDescriptorPoolUpdate(VkDevice device, VkCmdBuffer cmd)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(device);
-
-    return disp->EndDescriptorPoolUpdate(device, cmd);
-}
-
 LOADER_EXPORT VkResult VKAPI vkCreateDescriptorPool(VkDevice device, VkDescriptorPoolUsage poolUsage, uint32_t maxSets, const VkDescriptorPoolCreateInfo* pCreateInfo, VkDescriptorPool* pDescriptorPool)
 {
     const VkLayerDispatchTable *disp;
diff --git a/loader/vulkan.def b/loader/vulkan.def
index 57499981..a01e30e0 100644
--- a/loader/vulkan.def
+++ b/loader/vulkan.def
@@ -89,8 +89,6 @@ EXPORTS
    vkCreatePipelineLayout
    vkCreateSampler
    vkCreateDescriptorSetLayout
-   vkBeginDescriptorPoolUpdate
-   vkEndDescriptorPoolUpdate
    vkCreateDescriptorPool
    vkResetDescriptorPool
    vkAllocDescriptorSets
diff --git a/vulkan.py b/vulkan.py
index 9aab9148..c173fc13 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -557,14 +557,6 @@ core = Extension(
              Param("const VkDescriptorSetLayoutCreateInfo*", "pCreateInfo"),
              Param("VkDescriptorSetLayout*", "pSetLayout")]),
 
-        Proto("VkResult", "BeginDescriptorPoolUpdate",
-            [Param("VkDevice", "device"),
-             Param("VkDescriptorUpdateMode", "updateMode")]),
-
-        Proto("VkResult", "EndDescriptorPoolUpdate",
-            [Param("VkDevice", "device"),
-             Param("VkCmdBuffer", "cmd")]),
-
         Proto("VkResult", "CreateDescriptorPool",
             [Param("VkDevice", "device"),
              Param("VkDescriptorPoolUsage", "poolUsage"),