From 76078ed9fe3009386500c5545f499e1f6cdf067e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 10 Mar 2021 17:48:30 -0500 Subject: [PATCH] vk/util: add unified shader module struct/functions there's some extra logging stuff dumped into here to match functionality, eventually that should also be consolidated into vk_util.c Reviewed-by: Jason Ekstrand Part-of: --- src/vulkan/util/meson.build | 2 + src/vulkan/util/vk_shader_module.c | 77 ++++++++++++++++++++++++++++++++++++++ src/vulkan/util/vk_shader_module.h | 50 +++++++++++++++++++++++++ 3 files changed, 129 insertions(+) create mode 100644 src/vulkan/util/vk_shader_module.c create mode 100644 src/vulkan/util/vk_shader_module.h diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build index 6c2d7be..77ee8c1 100644 --- a/src/vulkan/util/meson.build +++ b/src/vulkan/util/meson.build @@ -39,6 +39,8 @@ files_vulkan_util = files( 'vk_physical_device.c', 'vk_physical_device.h', 'vk_render_pass.c', + 'vk_shader_module.c', + 'vk_shader_module.h', 'vk_util.c', 'vk_util.h', ) diff --git a/src/vulkan/util/vk_shader_module.c b/src/vulkan/util/vk_shader_module.c new file mode 100644 index 0000000..fd36717 --- /dev/null +++ b/src/vulkan/util/vk_shader_module.c @@ -0,0 +1,77 @@ +/* + * Copyright © 2017 Intel 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 "vk_shader_module.h" +#include "util/mesa-sha1.h" +#include "vk_common_entrypoints.h" +#include "vk_device.h" + +VKAPI_ATTR VkResult VKAPI_CALL +vk_common_CreateShaderModule(VkDevice _device, + const VkShaderModuleCreateInfo *pCreateInfo, + const VkAllocationCallbacks *pAllocator, + VkShaderModule *pShaderModule) +{ + VK_FROM_HANDLE(vk_device, device, _device); + struct vk_shader_module *module; + + assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO); + assert(pCreateInfo->flags == 0); + + module = vk_object_alloc(device, pAllocator, + sizeof(*module) + pCreateInfo->codeSize, + VK_OBJECT_TYPE_SHADER_MODULE); + if (module == NULL) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + module->size = pCreateInfo->codeSize; + module->nir = NULL; + memcpy(module->data, pCreateInfo->pCode, module->size); + + _mesa_sha1_compute(module->data, module->size, module->sha1); + + *pShaderModule = vk_shader_module_to_handle(module); + + return VK_SUCCESS; +} + +VKAPI_ATTR void VKAPI_CALL +vk_common_DestroyShaderModule(VkDevice _device, + VkShaderModule _module, + const VkAllocationCallbacks *pAllocator) +{ + VK_FROM_HANDLE(vk_device, device, _device); + VK_FROM_HANDLE(vk_shader_module, module, _module); + + if (!module) + return; + + /* NIR modules (which are only created internally by the driver) are not + * dynamically allocated so we should never call this for them. + * Instead the driver is responsible for freeing the NIR code when it is + * no longer needed. + */ + assert(module->nir == NULL); + + vk_object_free(device, pAllocator, module); +} diff --git a/src/vulkan/util/vk_shader_module.h b/src/vulkan/util/vk_shader_module.h new file mode 100644 index 0000000..baeed51 --- /dev/null +++ b/src/vulkan/util/vk_shader_module.h @@ -0,0 +1,50 @@ +/* + * Copyright © 2017 Intel 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. + */ + +#ifndef VK_SHADER_MODULE_H +#define VK_SHADER_MODULE_H + +#include +#include "vk_object.h" + +#ifdef __cplusplus +extern "C" { +#endif + +struct nir_shader; + +struct vk_shader_module { + struct vk_object_base base; + struct nir_shader *nir; + unsigned char sha1[20]; + uint32_t size; + char data[0]; +}; + +VK_DEFINE_NONDISP_HANDLE_CASTS(vk_shader_module, base, VkShaderModule, + VK_OBJECT_TYPE_SHADER_MODULE) +#ifdef __cplusplus +} +#endif + +#endif /* VK_SHADER_MODULE_H */ -- 2.7.4