From 08cb58fea610f58dedaad1544b3b922be733b24d Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Mon, 25 May 2015 16:27:50 +0800
Subject: v98: remove vk{Begin,End}DescriptorPoolUpdate()

Assume VK_DESCRIPTOR_UPDATE_MODE_FASTEST.

Conflicts:
	icd/intel/desc.c
	include/vulkan.h
---
 loader/gpa_helper.h |  4 ----
 loader/table_ops.h  |  6 ------
 loader/trampoline.c | 18 ------------------
 loader/vulkan.def   |  2 --
 4 files changed, 30 deletions(-)

(limited to 'loader')

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
-- 
cgit v1.2.3