diff options
author | Pierre Moreau <pierre.morrow@free.fr> | 2018-02-10 16:56:11 +0100 |
---|---|---|
committer | Karol Herbst <kherbst@redhat.com> | 2019-02-26 21:02:07 +0100 |
commit | 67769c913f2e1608530779be207bcb1eb46f3a90 (patch) | |
tree | f9f68a397aedf66ae19592a6597d610ac5039e1b /src/gallium/state_trackers/clover/core | |
parent | 669d00ba4cabf444de12eb3663c5251b519e1681 (diff) |
clover: Remove the TGSI backend as unused
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'src/gallium/state_trackers/clover/core')
-rw-r--r-- | src/gallium/state_trackers/clover/core/device.cpp | 10 | ||||
-rw-r--r-- | src/gallium/state_trackers/clover/core/program.cpp | 13 |
2 files changed, 6 insertions, 17 deletions
diff --git a/src/gallium/state_trackers/clover/core/device.cpp b/src/gallium/state_trackers/clover/core/device.cpp index 0d911e37514..1fae465dae4 100644 --- a/src/gallium/state_trackers/clover/core/device.cpp +++ b/src/gallium/state_trackers/clover/core/device.cpp @@ -244,15 +244,7 @@ device::vendor_name() const { enum pipe_shader_ir device::ir_format() const { - int supported_irs = - pipe->get_shader_param(pipe, PIPE_SHADER_COMPUTE, - PIPE_SHADER_CAP_SUPPORTED_IRS); - - if (supported_irs & (1 << PIPE_SHADER_IR_NATIVE)) { - return PIPE_SHADER_IR_NATIVE; - } - - return PIPE_SHADER_IR_TGSI; + return PIPE_SHADER_IR_NATIVE; } std::string diff --git a/src/gallium/state_trackers/clover/core/program.cpp b/src/gallium/state_trackers/clover/core/program.cpp index 4e74fccd973..ec71d99b017 100644 --- a/src/gallium/state_trackers/clover/core/program.cpp +++ b/src/gallium/state_trackers/clover/core/program.cpp @@ -22,7 +22,6 @@ #include "core/program.hpp" #include "llvm/invocation.hpp" -#include "tgsi/invocation.hpp" using namespace clover; @@ -51,10 +50,9 @@ program::compile(const ref_vector<device> &devs, const std::string &opts, std::string log; try { - const module m = (dev.ir_format() == PIPE_SHADER_IR_TGSI ? - tgsi::compile_program(_source, log) : - llvm::compile_program(_source, headers, dev, - opts, log)); + assert(dev.ir_format() == PIPE_SHADER_IR_NATIVE); + const module m = llvm::compile_program(_source, headers, dev, opts, + log); _builds[&dev] = { m, opts, log }; } catch (...) { _builds[&dev] = { module(), opts, log }; @@ -76,9 +74,8 @@ program::link(const ref_vector<device> &devs, const std::string &opts, std::string log = _builds[&dev].log; try { - const module m = (dev.ir_format() == PIPE_SHADER_IR_TGSI ? - tgsi::link_program(ms) : - llvm::link_program(ms, dev, opts, log)); + assert(dev.ir_format() == PIPE_SHADER_IR_NATIVE); + const module m = llvm::link_program(ms, dev, opts, log); _builds[&dev] = { m, opts, log }; } catch (...) { _builds[&dev] = { module(), opts, log }; |