From ae721ba9a94097749ff5f3284e3fd9105ed00eeb Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 25 May 2015 16:27:55 +0800 Subject: v98: replace vkUpdateDescriptors() by vkUpdateDescriptorSets() Only slightly tested. Conflicts: include/vulkan.h --- loader/gpa_helper.h | 4 ++-- loader/table_ops.h | 6 +++--- loader/trampoline.c | 4 ++-- loader/vulkan.def | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) (limited to 'loader') diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h index 28c10cfb..eb8d1fbb 100644 --- a/loader/gpa_helper.h +++ b/loader/gpa_helper.h @@ -166,8 +166,8 @@ static inline void* globalGetProcAddr(const char *name) return (void*) vkAllocDescriptorSets; if (!strcmp(name, "ClearDescriptorSets")) return (void*) vkClearDescriptorSets; - if (!strcmp(name, "UpdateDescriptors")) - return (void*) vkUpdateDescriptors; + if (!strcmp(name, "UpdateDescriptorSets")) + return (void*) vkUpdateDescriptorSets; if (!strcmp(name, "CreateDynamicViewportState")) return (void*) vkCreateDynamicViewportState; if (!strcmp(name, "CreateDynamicRasterState")) diff --git a/loader/table_ops.h b/loader/table_ops.h index 49107bb8..37e3774d 100644 --- a/loader/table_ops.h +++ b/loader/table_ops.h @@ -99,7 +99,7 @@ static inline void loader_initialize_dispatch_table(VkLayerDispatchTable *table, table->ResetDescriptorPool = (PFN_vkResetDescriptorPool) gpa(gpu, "vkResetDescriptorPool"); table->AllocDescriptorSets = (PFN_vkAllocDescriptorSets) gpa(gpu, "vkAllocDescriptorSets"); table->ClearDescriptorSets = (PFN_vkClearDescriptorSets) gpa(gpu, "vkClearDescriptorSets"); - table->UpdateDescriptors = (PFN_vkUpdateDescriptors) gpa(gpu, "vkUpdateDescriptors"); + table->UpdateDescriptorSets = (PFN_vkUpdateDescriptorSets) gpa(gpu, "vkUpdateDescriptorSets"); table->CreateDynamicViewportState = (PFN_vkCreateDynamicViewportState) gpa(gpu, "vkCreateDynamicViewportState"); table->CreateDynamicRasterState = (PFN_vkCreateDynamicRasterState) gpa(gpu, "vkCreateDynamicRasterState"); table->CreateDynamicColorBlendState = (PFN_vkCreateDynamicColorBlendState) gpa(gpu, "vkCreateDynamicColorBlendState"); @@ -300,8 +300,8 @@ static inline void *loader_lookup_dispatch_table(const VkLayerDispatchTable *tab return (void *) table->AllocDescriptorSets; if (!strcmp(name, "ClearDescriptorSets")) return (void *) table->ClearDescriptorSets; - if (!strcmp(name, "UpdateDescriptors")) - return (void *) table->UpdateDescriptors; + if (!strcmp(name, "UpdateDescriptorSets")) + return (void *) table->UpdateDescriptorSets; if (!strcmp(name, "CreateDynamicViewportState")) return (void *) table->CreateDynamicViewportState; if (!strcmp(name, "CreateDynamicRasterState")) diff --git a/loader/trampoline.c b/loader/trampoline.c index d07be991..082a5c2f 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -602,13 +602,13 @@ LOADER_EXPORT void VKAPI vkClearDescriptorSets(VkDevice device, VkDescriptorPool disp->ClearDescriptorSets(device, descriptorPool, count, pDescriptorSets); } -LOADER_EXPORT void VKAPI vkUpdateDescriptors(VkDevice device, VkDescriptorSet descriptorSet, uint32_t updateCount, const void** ppUpdateArray) +LOADER_EXPORT VkResult VKAPI vkUpdateDescriptorSets(VkDevice device, uint32_t writeCount, const VkWriteDescriptorSet* pDescriptorWrites, uint32_t copyCount, const VkCopyDescriptorSet* pDescriptorCopies) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - disp->UpdateDescriptors(device, descriptorSet, updateCount, ppUpdateArray); + return disp->UpdateDescriptorSets(device, writeCount, pDescriptorWrites, copyCount, pDescriptorCopies); } LOADER_EXPORT VkResult VKAPI vkCreateDynamicViewportState(VkDevice device, const VkDynamicVpStateCreateInfo* pCreateInfo, VkDynamicVpState* pState) diff --git a/loader/vulkan.def b/loader/vulkan.def index a01e30e0..2d92c89e 100644 --- a/loader/vulkan.def +++ b/loader/vulkan.def @@ -93,7 +93,6 @@ EXPORTS vkResetDescriptorPool vkAllocDescriptorSets vkClearDescriptorSets - vkUpdateDescriptors vkCreateDynamicViewportState vkCreateDynamicRasterState vkCreateDynamicColorBlendState -- cgit v1.2.3