From 27f6fcdcce3ae3311b8c38716126d3ac7c0c23df Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 26 Oct 2015 19:17:06 +0800 Subject: bug 14855: vkGetPipelineCacheSize is unique (consistency issue) (WIP) Update vkGetPipelineCacheData() to replace vkGetPipelineCacheSize(). https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14855 --- include/vk_layer.h | 1 - include/vulkan.h | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/vk_layer.h b/include/vk_layer.h index 692a2c0f..2043ac5d 100644 --- a/include/vk_layer.h +++ b/include/vk_layer.h @@ -82,7 +82,6 @@ typedef struct VkLayerDispatchTable_ PFN_vkDestroyShader DestroyShader; PFN_vkCreatePipelineCache CreatePipelineCache; PFN_vkDestroyPipelineCache DestroyPipelineCache; - PFN_vkGetPipelineCacheSize GetPipelineCacheSize; PFN_vkGetPipelineCacheData GetPipelineCacheData; PFN_vkMergePipelineCaches MergePipelineCaches; PFN_vkCreateGraphicsPipelines CreateGraphicsPipelines; diff --git a/include/vulkan.h b/include/vulkan.h index 5ea8e603..b067b833 100644 --- a/include/vulkan.h +++ b/include/vulkan.h @@ -2149,8 +2149,7 @@ typedef VkResult (VKAPI *PFN_vkCreateShader)(VkDevice device, const VkShaderCrea typedef void (VKAPI *PFN_vkDestroyShader)(VkDevice device, VkShader shader); typedef VkResult (VKAPI *PFN_vkCreatePipelineCache)(VkDevice device, const VkPipelineCacheCreateInfo* pCreateInfo, VkPipelineCache* pPipelineCache); typedef void (VKAPI *PFN_vkDestroyPipelineCache)(VkDevice device, VkPipelineCache pipelineCache); -typedef size_t (VKAPI *PFN_vkGetPipelineCacheSize)(VkDevice device, VkPipelineCache pipelineCache); -typedef VkResult (VKAPI *PFN_vkGetPipelineCacheData)(VkDevice device, VkPipelineCache pipelineCache, size_t dataSize, void* pData); +typedef VkResult (VKAPI *PFN_vkGetPipelineCacheData)(VkDevice device, VkPipelineCache pipelineCache, size_t* pDataSize, void* pData); typedef VkResult (VKAPI *PFN_vkMergePipelineCaches)(VkDevice device, VkPipelineCache destCache, uint32_t srcCacheCount, const VkPipelineCache* pSrcCaches); typedef VkResult (VKAPI *PFN_vkCreateGraphicsPipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkGraphicsPipelineCreateInfo* pCreateInfos, VkPipeline* pPipelines); typedef VkResult (VKAPI *PFN_vkCreateComputePipelines)(VkDevice device, VkPipelineCache pipelineCache, uint32_t count, const VkComputePipelineCreateInfo* pCreateInfos, VkPipeline* pPipelines); @@ -2566,14 +2565,10 @@ void VKAPI vkDestroyPipelineCache( VkDevice device, VkPipelineCache pipelineCache); -size_t VKAPI vkGetPipelineCacheSize( - VkDevice device, - VkPipelineCache pipelineCache); - VkResult VKAPI vkGetPipelineCacheData( VkDevice device, VkPipelineCache pipelineCache, - size_t dataSize, + size_t* pDataSize, void* pData); VkResult VKAPI vkMergePipelineCaches( -- cgit v1.2.3