From 46176f157b1e47421bbfddb9917b2c1eef6b18c8 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Sat, 31 Oct 2015 00:31:16 +0800 Subject: bug 14608: VkShaderModule object lifetime (WIP) Remove VkShader. We add a simple cache to intel_shader_module in place of intel_shader. https://cvs.khronos.org/bugzilla/show_bug.cgi?id=14608 --- icd/nulldrv/nulldrv.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'icd') diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c index 1a3595fd..074ee592 100644 --- a/icd/nulldrv/nulldrv.c +++ b/icd/nulldrv/nulldrv.c @@ -447,22 +447,6 @@ static struct nulldrv_desc_layout *nulldrv_desc_layout(const VkDescriptorSetLayo return *(struct nulldrv_desc_layout **) &layout; } -static VkResult shader_create(struct nulldrv_dev *dev, - const VkShaderCreateInfo *info, - struct nulldrv_shader **sh_ret) -{ - struct nulldrv_shader *sh; - - sh = (struct nulldrv_shader *) nulldrv_base_create(dev, sizeof(*sh), - VK_OBJECT_TYPE_SHADER); - if (!sh) - return VK_ERROR_OUT_OF_HOST_MEMORY; - - *sh_ret = sh; - - return VK_SUCCESS; -} - static VkResult graphics_pipeline_create(struct nulldrv_dev *dev, const VkGraphicsPipelineCreateInfo *info_, struct nulldrv_pipeline **pipeline_ret) @@ -1893,26 +1877,6 @@ ICD_EXPORT void VKAPI vkDestroyShaderModule( NULLDRV_LOG_FUNC; } -ICD_EXPORT VkResult VKAPI vkCreateShader( - VkDevice device, - const VkShaderCreateInfo* pCreateInfo, - const VkAllocationCallbacks* pAllocator, - VkShader* pShader) -{ - NULLDRV_LOG_FUNC; - struct nulldrv_dev *dev = nulldrv_dev(device); - - return shader_create(dev, pCreateInfo, (struct nulldrv_shader **) pShader); -} - -ICD_EXPORT void VKAPI vkDestroyShader( - VkDevice device, - VkShader shader, - const VkAllocationCallbacks* pAllocator) -{ - NULLDRV_LOG_FUNC; -} - ICD_EXPORT VkResult VKAPI vkCreateBufferView( VkDevice device, const VkBufferViewCreateInfo* pCreateInfo, -- cgit v1.2.3