OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: move gl_shader_stage from radv_binary to radv_shader_info

Browse Source 
This way, both radv_shader and radv_shader_binary, provide the stage.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22029>
This commit is contained in:
Daniel Schürmann
2023-03-17 00:49:44 +01:00
committed by Marge Bot
parent 2c8d101c71
commit 55caea6453
6 changed files with 27 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -899,7 +899,7 @@ radv_llvm_compile(LLVMModuleRef M, char **pelf_buffer, size_t *pelf_size,
static void
ac_compile_llvm_module(struct ac_llvm_compiler *ac_llvm, LLVMModuleRef llvm_module,
struct radv_shader_binary **rbinary, gl_shader_stage stage, const char *name,
struct radv_shader_binary **rbinary, const char *name,
const struct radv_nir_compiler_options *options)
{
char *elf_buffer = NULL;
@@ -935,7 +935,6 @@ ac_compile_llvm_module(struct ac_llvm_compiler *ac_llvm, LLVMModuleRef llvm_modu
memcpy(rbin->data + elf_size, llvm_ir_string, llvm_ir_size + 1);
rbin->base.type = RADV_BINARY_TYPE_RTLD;
rbin->base.stage = stage;
rbin->base.total_size = alloc_size;
rbin->elf_size = elf_size;
rbin->llvm_ir_size = llvm_ir_size;
@@ -958,9 +957,8 @@ radv_compile_nir_shader(struct ac_llvm_compiler *ac_llvm,
llvm_module = ac_translate_nir_to_llvm(ac_llvm, options, info, nir, nir_count, args);
ac_compile_llvm_module(ac_llvm, llvm_module, rbinary, nir[nir_count - 1]->info.stage,
radv_get_shader_name(info, nir[nir_count - 1]->info.stage),
options);
ac_compile_llvm_module(ac_llvm, llvm_module, rbinary,
radv_get_shader_name(info, nir[nir_count - 1]->info.stage), options);
}
void