vulkan.h: V100 -- Remove vkClearDescriptorSets, Bug# 13783

Conflicts:
	layers/draw_state.cpp

12 files changed, 1 insertions, 61 deletions

diff --git a/demos/cube.c b/demos/cube.c
index 737745a7..b06674d4 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1526,8 +1526,6 @@ static void demo_prepare_descriptor_set(struct demo *demo)
             &demo->desc_set, &count);
     assert(!err && count == 1);
 
-    vkClearDescriptorSets(demo->device, demo->desc_pool, 1, &demo->desc_set);
-
     memset(&tex_descs, 0, sizeof(tex_descs));
     for (i = 0; i < DEMO_TEXTURE_COUNT; i++) {
         tex_descs[i].sampler = demo->textures[i].sampler;
diff --git a/demos/tri.c b/demos/tri.c
index 6e7a44cc..be151a74 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1142,8 +1142,6 @@ static void demo_prepare_descriptor_set(struct demo *demo)
             &demo->desc_set, &count);
     assert(!err && count == 1);
 
-    vkClearDescriptorSets(demo->device, demo->desc_pool, 1, &demo->desc_set);
-
     memset(&tex_descs, 0, sizeof(tex_descs));
     for (i = 0; i < DEMO_TEXTURE_COUNT; i++) {
         tex_descs[i].sampler = demo->textures[i].sampler;
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 5a62a402..ff0a901a 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -2174,15 +2174,6 @@ ICD_EXPORT VkResult VKAPI vkAllocDescriptorSets(
     return ret;
 }
 
-ICD_EXPORT void VKAPI vkClearDescriptorSets(
-    VkDevice                                device,
-    VkDescriptorPool                        descriptorPool,
-    uint32_t                                     count,
-    const VkDescriptorSet*                    pDescriptorSets)
-{
-    NULLDRV_LOG_FUNC;
-}
-
 ICD_EXPORT VkResult VKAPI vkUpdateDescriptorSets(
     VkDevice                                    device,
     uint32_t                                    writeCount,
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,
diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index 07d4086b..b0714231 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -1943,14 +1943,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkAllocDescriptorSets(VkDevice device, VkDescript
     return result;
 }
 
-VK_LAYER_EXPORT void VKAPI vkClearDescriptorSets(VkDevice device, VkDescriptorPool descriptorPool, uint32_t count, const VkDescriptorSet* pDescriptorSets)
-{
-    for (uint32_t i = 0; i < count; i++) {
-        clearDescriptorSet(pDescriptorSets[i]);
-    }
-    get_dispatch_table(draw_state_device_table_map, device)->ClearDescriptorSets(device, descriptorPool, count, pDescriptorSets);
-}
-
 VK_LAYER_EXPORT VkResult VKAPI vkUpdateDescriptorSets(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies)
 {
     if (dsUpdate(VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET, writeCount, pDescriptorWrites) &&
@@ -2883,8 +2875,6 @@ VK_LAYER_EXPORT void* VKAPI vkGetDeviceProcAddr(VkDevice dev, const char* funcNa
         return (void*) vkResetDescriptorPool;
     if (!strcmp(funcName, "vkAllocDescriptorSets"))
         return (void*) vkAllocDescriptorSets;
-    if (!strcmp(funcName, "vkClearDescriptorSets"))
-        return (void*) vkClearDescriptorSets;
     if (!strcmp(funcName, "vkUpdateDescriptorSets"))
         return (void*) vkUpdateDescriptorSets;
     if (!strcmp(funcName, "vkCreateDynamicViewportState"))
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp
index 20608ede..eeea84b0 100644
--- a/layers/param_checker.cpp
+++ b/layers/param_checker.cpp
@@ -1061,12 +1061,6 @@ VK_LAYER_EXPORT VkResult VKAPI vkAllocDescriptorSets(VkDevice device, VkDescript
     return result;
 }
 
-VK_LAYER_EXPORT void VKAPI vkClearDescriptorSets(VkDevice device, VkDescriptorPool descriptorPool, uint32_t count, const VkDescriptorSet* pDescriptorSets)
-{
-
-    device_dispatch_table(device)->ClearDescriptorSets(device, descriptorPool, count, pDescriptorSets);
-}
-
 VK_LAYER_EXPORT VkResult VKAPI vkUpdateDescriptorSets(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies)
 {
 
@@ -2067,8 +2061,6 @@ static inline void* layer_intercept_proc(const char *name)
         return (void*) vkResetDescriptorPool;
     if (!strcmp(name, "AllocDescriptorSets"))
         return (void*) vkAllocDescriptorSets;
-    if (!strcmp(name, "ClearDescriptorSets"))
-        return (void*) vkClearDescriptorSets;
     if (!strcmp(name, "CreateDynamicViewportState"))
         return (void*) vkCreateDynamicViewportState;
     if (!strcmp(name, "CreateDynamicRasterState"))
diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h
index 3b2d0989..20b0b519 100644
--- a/loader/gpa_helper.h
+++ b/loader/gpa_helper.h
@@ -159,8 +159,6 @@ static inline void* globalGetProcAddr(const char *name)
         return (void*) vkResetDescriptorPool;
     if (!strcmp(name, "AllocDescriptorSets"))
         return (void*) vkAllocDescriptorSets;
-    if (!strcmp(name, "ClearDescriptorSets"))
-        return (void*) vkClearDescriptorSets;
     if (!strcmp(name, "UpdateDescriptorSets"))
         return (void*) vkUpdateDescriptorSets;
     if (!strcmp(name, "CreateDynamicViewportState"))
diff --git a/loader/table_ops.h b/loader/table_ops.h
index d7dcdf83..a2c67c30 100644
--- a/loader/table_ops.h
+++ b/loader/table_ops.h
@@ -91,7 +91,6 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table
     table->CreateDescriptorPool = (PFN_vkCreateDescriptorPool) gpa(dev, "vkCreateDescriptorPool");
     table->ResetDescriptorPool = (PFN_vkResetDescriptorPool) gpa(dev, "vkResetDescriptorPool");
     table->AllocDescriptorSets = (PFN_vkAllocDescriptorSets) gpa(dev, "vkAllocDescriptorSets");
-    table->ClearDescriptorSets = (PFN_vkClearDescriptorSets) gpa(dev, "vkClearDescriptorSets");
     table->UpdateDescriptorSets = (PFN_vkUpdateDescriptorSets) gpa(dev, "vkUpdateDescriptorSets");
     table->CreateDynamicViewportState = (PFN_vkCreateDynamicViewportState) gpa(dev, "vkCreateDynamicViewportState");
     table->CreateDynamicRasterState = (PFN_vkCreateDynamicRasterState) gpa(dev, "vkCreateDynamicRasterState");
@@ -265,8 +264,6 @@ static inline void *loader_lookup_device_dispatch_table(
         return (void *) table->ResetDescriptorPool;
     if (!strcmp(name, "AllocDescriptorSets"))
         return (void *) table->AllocDescriptorSets;
-    if (!strcmp(name, "ClearDescriptorSets"))
-        return (void *) table->ClearDescriptorSets;
     if (!strcmp(name, "UpdateDescriptorSets"))
         return (void *) table->UpdateDescriptorSets;
     if (!strcmp(name, "CreateDynamicViewportState"))
diff --git a/loader/trampoline.c b/loader/trampoline.c
index 5392b119..3361af4a 100644
--- a/loader/trampoline.c
+++ b/loader/trampoline.c
@@ -716,15 +716,6 @@ LOADER_EXPORT VkResult VKAPI vkAllocDescriptorSets(VkDevice device, VkDescriptor
     return disp->AllocDescriptorSets(device, descriptorPool, setUsage, count, pSetLayouts, pDescriptorSets, pCount);
 }
 
-LOADER_EXPORT void VKAPI vkClearDescriptorSets(VkDevice device, VkDescriptorPool descriptorPool, uint32_t count, const VkDescriptorSet* pDescriptorSets)
-{
-    const VkLayerDispatchTable *disp;
-
-    disp = loader_get_dispatch(device);
-
-    disp->ClearDescriptorSets(device, descriptorPool, count, pDescriptorSets);
-}
-
 LOADER_EXPORT VkResult VKAPI vkUpdateDescriptorSets(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies)
 {
     const VkLayerDispatchTable *disp;
diff --git a/loader/vulkan.def b/loader/vulkan.def
index e6c6930d..ef4ac1bb 100644
--- a/loader/vulkan.def
+++ b/loader/vulkan.def
@@ -90,7 +90,6 @@ EXPORTS
    vkCreateDescriptorPool
    vkResetDescriptorPool
    vkAllocDescriptorSets
-   vkClearDescriptorSets
    vkUpdateDescriptorSets
    vkCreateDynamicViewportState
    vkCreateDynamicRasterState
diff --git a/vulkan.py b/vulkan.py
index ec7f681a..a83aa8d2 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -559,12 +559,6 @@ core = Extension(
              Param("VkDescriptorSet*", "pDescriptorSets"),
              Param("uint32_t*", "pCount")]),
 
-        Proto("void", "ClearDescriptorSets",
-            [Param("VkDevice", "device"),
-             Param("VkDescriptorPool", "descriptorPool"),
-             Param("uint32_t", "count"),
-             Param("const VkDescriptorSet*", "pDescriptorSets")]),
-
         Proto("VkResult", "UpdateDescriptorSets",
             [Param("VkDevice", "device"),
              Param("uint32_t", "writeCount"),