diff options
| author | Chia-I Wu <olv@lunarg.com> | 2015-10-26 19:17:06 +0800 |
|---|---|---|
| committer | Chia-I Wu <olv@lunarg.com> | 2015-10-30 20:49:23 +0800 |
| commit | 27f6fcdcce3ae3311b8c38716126d3ac7c0c23df (patch) | |
| tree | 00d3f37bc5679810bfe6baa6e01fae207f257f7e /loader | |
| parent | fb21ede24cee2b0fa1b9bc659626b4a7bf2e6a6d (diff) | |
| download | usermoji-27f6fcdcce3ae3311b8c38716126d3ac7c0c23df.tar.xz | |
bug 14855: vkGetPipelineCacheSize is unique (consistency issue) (WIP)
Update vkGetPipelineCacheData() to replace vkGetPipelineCacheSize().
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14855
Diffstat (limited to 'loader')
| -rw-r--r-- | loader/gpa_helper.h | 2 | ||||
| -rw-r--r-- | loader/table_ops.h | 3 | ||||
| -rw-r--r-- | loader/trampoline.c | 13 |
3 files changed, 2 insertions, 16 deletions
diff --git a/loader/gpa_helper.h b/loader/gpa_helper.h index 11de1aa4..8404e129 100644 --- a/loader/gpa_helper.h +++ b/loader/gpa_helper.h @@ -169,8 +169,6 @@ static inline void* globalGetProcAddr(const char *name) return (void*) vkCreatePipelineCache; if (!strcmp(name, "DestroyPipelineCache")) return (void*) vkDestroyPipelineCache; - if (!strcmp(name, "GetPipelineCacheSize")) - return (void*) vkGetPipelineCacheSize; if (!strcmp(name, "GetPipelineCacheData")) return (void*) vkGetPipelineCacheData; if (!strcmp(name, "MergePipelineCaches")) diff --git a/loader/table_ops.h b/loader/table_ops.h index 6edb7496..7ff49a20 100644 --- a/loader/table_ops.h +++ b/loader/table_ops.h @@ -90,7 +90,6 @@ static inline void loader_init_device_dispatch_table(VkLayerDispatchTable *table table->DestroyShader = (PFN_vkDestroyShader) gpa(dev, "vkDestroyShader"); table->CreatePipelineCache = (PFN_vkCreatePipelineCache) gpa(dev, "vkCreatePipelineCache"); table->DestroyPipelineCache = (PFN_vkDestroyPipelineCache) gpa(dev, "vkDestroyPipelineCache"); - table->GetPipelineCacheSize = (PFN_vkGetPipelineCacheSize) gpa(dev, "vkGetPipelineCacheSize"); table->GetPipelineCacheData = (PFN_vkGetPipelineCacheData) gpa(dev, "vkGetPipelineCacheData"); table->MergePipelineCaches = (PFN_vkMergePipelineCaches) gpa(dev, "vkMergePipelineCaches"); table->CreateGraphicsPipelines = (PFN_vkCreateGraphicsPipelines) gpa(dev, "vkCreateGraphicsPipelines"); @@ -294,8 +293,6 @@ static inline void *loader_lookup_device_dispatch_table( return (void*) vkCreatePipelineCache; if (!strcmp(name, "DestroyPipelineCache")) return (void*) vkDestroyPipelineCache; - if (!strcmp(name, "GetPipelineCacheSize")) - return (void*) vkGetPipelineCacheSize; if (!strcmp(name, "GetPipelineCacheData")) return (void*) vkGetPipelineCacheData; if (!strcmp(name, "MergePipelineCaches")) diff --git a/loader/trampoline.c b/loader/trampoline.c index d677253d..f3fecf8e 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -801,22 +801,13 @@ LOADER_EXPORT void VKAPI vkDestroyPipelineCache(VkDevice device, VkPipelineCache disp->DestroyPipelineCache(device, pipelineCache); } -LOADER_EXPORT size_t VKAPI vkGetPipelineCacheSize(VkDevice device, VkPipelineCache pipelineCache) +LOADER_EXPORT VkResult VKAPI vkGetPipelineCacheData(VkDevice device, VkPipelineCache pipelineCache, size_t* pDataSize, void* pData) { const VkLayerDispatchTable *disp; disp = loader_get_dispatch(device); - return disp->GetPipelineCacheSize(device, pipelineCache); -} - -LOADER_EXPORT VkResult VKAPI vkGetPipelineCacheData(VkDevice device, VkPipelineCache pipelineCache, size_t dataSize, void* pData) -{ - const VkLayerDispatchTable *disp; - - disp = loader_get_dispatch(device); - - return disp->GetPipelineCacheData(device, pipelineCache, dataSize, pData); + return disp->GetPipelineCacheData(device, pipelineCache, pDataSize, pData); } LOADER_EXPORT VkResult VKAPI vkMergePipelineCaches(VkDevice device, VkPipelineCache destCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches) |