From: Boris Brezillon Date: Tue, 14 Jun 2022 09:39:24 +0000 (-0700) Subject: dzn: Drop dzn_pipeline_cache.c X-Git-Tag: upstream/22.3.5~6816 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c66caa1d589e052b5a472fd97ef11503a1e22f67;p=platform%2Fupstream%2Fmesa.git dzn: Drop dzn_pipeline_cache.c The core provides a conformant pipeline cache implementation, let's use it. Reviewed-by: Jesse Natalie Part-of: --- diff --git a/src/microsoft/vulkan/dzn_pipeline_cache.c b/src/microsoft/vulkan/dzn_pipeline_cache.c deleted file mode 100644 index 5f0f36c..0000000 --- a/src/microsoft/vulkan/dzn_pipeline_cache.c +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright © Microsoft Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#include "dzn_private.h" - -#include "vk_alloc.h" - -static void -dzn_pipeline_cache_destroy(struct dzn_pipeline_cache *pcache, - const VkAllocationCallbacks *pAllocator) -{ - if (!pcache) - return; - - struct dzn_device *device = container_of(pcache->base.device, struct dzn_device, vk); - - vk_object_base_finish(&pcache->base); - vk_free2(&device->vk.alloc, pAllocator, pcache); -} - -static VkResult -dzn_pipeline_cache_create(struct dzn_device *device, - const VkPipelineCacheCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkPipelineCache *out) -{ - struct dzn_pipeline_cache *pcache = - vk_alloc2(&device->vk.alloc, pAllocator, sizeof(*pcache), 8, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); - if (!pcache) - return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); - - vk_object_base_init(&device->vk, &pcache->base, VK_OBJECT_TYPE_PIPELINE_CACHE); - - /* TODO: cache-ism! */ - - *out = dzn_pipeline_cache_to_handle(pcache); - return VK_SUCCESS; -} - -VKAPI_ATTR VkResult VKAPI_CALL -dzn_CreatePipelineCache(VkDevice device, - const VkPipelineCacheCreateInfo *pCreateInfo, - const VkAllocationCallbacks *pAllocator, - VkPipelineCache *pPipelineCache) -{ - return dzn_pipeline_cache_create(dzn_device_from_handle(device), - pCreateInfo, pAllocator, pPipelineCache); -} - -VKAPI_ATTR void VKAPI_CALL -dzn_DestroyPipelineCache(VkDevice device, - VkPipelineCache pipelineCache, - const VkAllocationCallbacks *pAllocator) -{ - dzn_pipeline_cache_destroy(dzn_pipeline_cache_from_handle(pipelineCache), - pAllocator); -} - -VKAPI_ATTR VkResult VKAPI_CALL -dzn_GetPipelineCacheData(VkDevice device, - VkPipelineCache pipelineCache, - size_t *pDataSize, - void *pData) -{ - // FIXME - *pDataSize = 0; - return VK_SUCCESS; -} - -VKAPI_ATTR VkResult VKAPI_CALL -dzn_MergePipelineCaches(VkDevice device, - VkPipelineCache dstCache, - uint32_t srcCacheCount, - const VkPipelineCache *pSrcCaches) -{ - // FIXME - return VK_SUCCESS; -} diff --git a/src/microsoft/vulkan/dzn_private.h b/src/microsoft/vulkan/dzn_private.h index f2cc40d..282ea38 100644 --- a/src/microsoft/vulkan/dzn_private.h +++ b/src/microsoft/vulkan/dzn_private.h @@ -693,10 +693,6 @@ struct dzn_descriptor_update_template { const struct dzn_descriptor_update_template_entry *entries; }; -struct dzn_pipeline_cache { - struct vk_object_base base; -}; - enum dzn_register_space { DZN_REGISTER_SPACE_SYSVALS = MAX_SETS, DZN_REGISTER_SPACE_PUSH_CONSTANT, @@ -1101,7 +1097,6 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(dzn_image_view, vk.base, VkImageView, VK_OBJECT_T VK_DEFINE_NONDISP_HANDLE_CASTS(dzn_pipeline, base, VkPipeline, VK_OBJECT_TYPE_PIPELINE) VK_DEFINE_NONDISP_HANDLE_CASTS(dzn_graphics_pipeline, base.base, VkPipeline, VK_OBJECT_TYPE_PIPELINE) VK_DEFINE_NONDISP_HANDLE_CASTS(dzn_compute_pipeline, base.base, VkPipeline, VK_OBJECT_TYPE_PIPELINE) -VK_DEFINE_NONDISP_HANDLE_CASTS(dzn_pipeline_cache, base, VkPipelineCache, VK_OBJECT_TYPE_PIPELINE_CACHE) VK_DEFINE_NONDISP_HANDLE_CASTS(dzn_pipeline_layout, base, VkPipelineLayout, VK_OBJECT_TYPE_PIPELINE_LAYOUT) VK_DEFINE_NONDISP_HANDLE_CASTS(dzn_query_pool, base, VkQueryPool, VK_OBJECT_TYPE_QUERY_POOL) VK_DEFINE_NONDISP_HANDLE_CASTS(dzn_sampler, base, VkSampler, VK_OBJECT_TYPE_SAMPLER) diff --git a/src/microsoft/vulkan/meson.build b/src/microsoft/vulkan/meson.build index d814b64..3d80f22 100644 --- a/src/microsoft/vulkan/meson.build +++ b/src/microsoft/vulkan/meson.build @@ -37,7 +37,6 @@ libdzn_files = files( 'dzn_image.c', 'dzn_meta.c', 'dzn_nir.c', - 'dzn_pipeline_cache.c', 'dzn_pipeline.c', 'dzn_query.c', 'dzn_sync.c',