From 4d982ae2c78e2108ecc289010faeb2fd03171c2e Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 1 Feb 2018 13:52:55 +1100 Subject: [PATCH] gallium/st/clover: remove unused PIPE_SHADER_IR_LLVM MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This has been unused since 100796c15c3a. Acked-by: Marek Olšák --- src/gallium/docs/source/screen.rst | 4 ++-- src/gallium/include/pipe/p_defines.h | 1 - src/gallium/include/pipe/p_state.h | 5 +++-- src/gallium/state_trackers/clover/llvm/codegen.hpp | 4 ---- src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp | 6 ------ src/gallium/state_trackers/clover/llvm/invocation.cpp | 3 --- src/mesa/state_tracker/st_program.c | 1 - 7 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst index c33facb79b6..cb3418fce35 100644 --- a/src/gallium/docs/source/screen.rst +++ b/src/gallium/docs/source/screen.rst @@ -531,8 +531,8 @@ pipe_screen::get_compute_param. * ``PIPE_COMPUTE_CAP_IR_TARGET``: A description of the target of the form ``processor-arch-manufacturer-os`` that will be passed on to the compiler. - This CAP is only relevant for drivers that specify PIPE_SHADER_IR_LLVM - or PIPE_SHADER_IR_NATIVE for their preferred IR. + This CAP is only relevant for drivers that specify PIPE_SHADER_IR_NATIVE for + their preferred IR. Value type: null-terminated string. Shader IR type dependent. * ``PIPE_COMPUTE_CAP_GRID_DIMENSION``: Number of supported dimensions for grid and block coordinates. Value type: ``uint64_t``. Shader IR type dependent. diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 19941350b81..778e5f4e539 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -894,7 +894,6 @@ enum pipe_shader_cap enum pipe_shader_ir { PIPE_SHADER_IR_TGSI = 0, - PIPE_SHADER_IR_LLVM, PIPE_SHADER_IR_NATIVE, PIPE_SHADER_IR_NIR, }; diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index 10d21db28c6..2b56d60b5ed 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -782,8 +782,9 @@ struct pipe_blit_info struct pipe_grid_info { /** - * For drivers that use PIPE_SHADER_IR_LLVM as their prefered IR, this value - * will be the index of the kernel in the opencl.kernels metadata list. + * For drivers that use PIPE_SHADER_IR_NATIVE as their prefered IR, this + * value will be the index of the kernel in the opencl.kernels metadata + * list. */ uint32_t pc; diff --git a/src/gallium/state_trackers/clover/llvm/codegen.hpp b/src/gallium/state_trackers/clover/llvm/codegen.hpp index 25f6e01beb5..e35627c4729 100644 --- a/src/gallium/state_trackers/clover/llvm/codegen.hpp +++ b/src/gallium/state_trackers/clover/llvm/codegen.hpp @@ -38,10 +38,6 @@ namespace clover { namespace llvm { - module - build_module_bitcode(const ::llvm::Module &mod, - const clang::CompilerInstance &c); - std::string print_module_bitcode(const ::llvm::Module &mod); diff --git a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp index 6737f7af0aa..679ecd87580 100644 --- a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp +++ b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp @@ -71,12 +71,6 @@ namespace { } } -module -clover::llvm::build_module_bitcode(const ::llvm::Module &mod, - const clang::CompilerInstance &c) { - return build_module_common(mod, emit_code(mod), get_symbol_offsets(mod), c); -} - std::string clover::llvm::print_module_bitcode(const ::llvm::Module &mod) { std::string s; diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp index a373df4eac6..e4ca5fa4442 100644 --- a/src/gallium/state_trackers/clover/llvm/invocation.cpp +++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp @@ -291,9 +291,6 @@ clover::llvm::link_program(const std::vector &modules, if (create_library) { return build_module_library(*mod, module::section::text_library); - } else if (ir == PIPE_SHADER_IR_LLVM) { - return build_module_bitcode(*mod, *c); - } else if (ir == PIPE_SHADER_IR_NATIVE) { if (has_flag(debug::native)) debug::log(id + ".asm", print_module_native(*mod, target)); diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 1116b5afbc8..2c367efa6c3 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -368,7 +368,6 @@ st_release_cp_variants(struct st_context *st, struct st_compute_program *stcp) case PIPE_SHADER_IR_NIR: /* pipe driver took ownership of prog */ break; - case PIPE_SHADER_IR_LLVM: case PIPE_SHADER_IR_NATIVE: /* ??? */ stcp->tgsi.prog = NULL; -- 2.30.2