From d1d04cfeaae18283b66a89721ec3510236360ee0 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 2 Apr 2024 17:29:51 +0200 Subject: [PATCH] radv: add radv_nir_to_llvm.h Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/meson.build | 1 + src/amd/vulkan/radv_nir_to_llvm.c | 1 + src/amd/vulkan/radv_nir_to_llvm.h | 41 +++++++++++++++++++++++++++++++ src/amd/vulkan/radv_private.h | 4 --- src/amd/vulkan/radv_shader.c | 1 + 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 src/amd/vulkan/radv_nir_to_llvm.h diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 41797cbfac3..ec5b13d07e7 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -198,6 +198,7 @@ if with_llvm 'radv_llvm_helper.cpp', 'radv_llvm_helper.h', 'radv_nir_to_llvm.c', + 'radv_nir_to_llvm.h', ) endif diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c index 2b3eb21ffaa..d1263346a68 100644 --- a/src/amd/vulkan/radv_nir_to_llvm.c +++ b/src/amd/vulkan/radv_nir_to_llvm.c @@ -25,6 +25,7 @@ * IN THE SOFTWARE. */ +#include "radv_nir_to_llvm.h" #include "nir/nir.h" #include "radv_debug.h" #include "radv_llvm_helper.h" diff --git a/src/amd/vulkan/radv_nir_to_llvm.h b/src/amd/vulkan/radv_nir_to_llvm.h new file mode 100644 index 00000000000..91f6f5c6632 --- /dev/null +++ b/src/amd/vulkan/radv_nir_to_llvm.h @@ -0,0 +1,41 @@ +/* + * Copyright © 2016 Red Hat. + * Copyright © 2016 Bas Nieuwenhuizen + * + * based in part on anv driver which is: + * Copyright © 2015 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 RADV_NIR_TO_LLVM_H +#define RADV_NIR_TO_LLVM_H + +struct radv_nir_compiler_options; +struct radv_shader_info; +struct nir_shader; +struct radv_shader_binary; +struct radv_shader_args; + +void llvm_compile_shader(const struct radv_nir_compiler_options *options, const struct radv_shader_info *info, + unsigned shader_count, struct nir_shader *const *shaders, struct radv_shader_binary **binary, + const struct radv_shader_args *args); + +#endif /* RADV_NIR_TO_LLVM_H */ diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index 88ae3f17f8e..6cb659bf7eb 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -282,10 +282,6 @@ struct radv_shader_args; struct radv_nir_compiler_options; struct radv_shader_info; -void llvm_compile_shader(const struct radv_nir_compiler_options *options, const struct radv_shader_info *info, - unsigned shader_count, struct nir_shader *const *shaders, struct radv_shader_binary **binary, - const struct radv_shader_args *args); - #define RADV_FROM_HANDLE(__radv_type, __name, __handle) VK_FROM_HANDLE(__radv_type, __name, __handle) #ifdef __cplusplus diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 0a5208d3fc2..0a153d2b55b 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -38,6 +38,7 @@ #include "util/u_atomic.h" #include "radv_cs.h" #include "radv_debug.h" +#include "radv_nir_to_llvm.h" #include "radv_printf.h" #include "radv_private.h" #include "radv_sdma.h"