gallium/st/clover: remove unused PIPE_SHADER_IR_LLVM

This has been unused since 100796c15c3a.

Acked-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/docs/source/screen.rst b/src/gallium/docs/source/screen.rst
index c33facb79b6f888983fb67a21cbb34d9ab630eb0..cb3418fce35fb28d3fa2cf8f9ef94f6aec3a0a6b 100644 (file)
--- 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 19941350b81312af2c67eb090507074811384508..778e5f4e5394459ba866a830d79243ecddbc6050 100644 (file)
--- 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 10d21db28c681606fe11b20abf3a5eb4e2115b6f..2b56d60b5ed9eed4aeba858237dd74b625a71e12 100644 (file)
--- 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 25f6e01beb5c306eb2cf49671a4e2df7b3fa5fa4..e35627c4729de52849d1bca77ab9c7f4f9ff9b1d 100644 (file)
--- 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 6737f7af0aae5e0092bcbb6dbcbfc06caea17904..679ecd87580b386da5e5c4903fc40662ac956527 100644 (file)
--- 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 a373df4eac66078c455e51fec1f8a37bf2a505eb..e4ca5fa444249a181a873b8f7695ff58a024d519 100644 (file)
--- 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<module> &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 1116b5afbc8ad2250b3b6ecdeef42807a007fee1..2c367efa6c3db03cf12a53a683abe14bad43b9cc 100644 (file)
--- 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;