diff options
author | Francisco Jerez <currojerez@riseup.net> | 2016-05-17 16:03:07 +0200 |
---|---|---|
committer | Francisco Jerez <currojerez@riseup.net> | 2016-07-11 20:34:34 -0700 |
commit | ba613636e8a0f16e0386dc7dc88529f7027eecea (patch) | |
tree | 1711a6fdf2405676608e46a36889c602e3b0c6aa /src/gallium/state_trackers/clover/core | |
parent | fb3eeb1314c3269818e58e64b460d045ea5b466d (diff) | |
download | external_mesa3d-ba613636e8a0f16e0386dc7dc88529f7027eecea.zip external_mesa3d-ba613636e8a0f16e0386dc7dc88529f7027eecea.tar.gz external_mesa3d-ba613636e8a0f16e0386dc7dc88529f7027eecea.tar.bz2 |
clover/tgsi: Move compiler entry point declaration into tgsi directory and namespace.
Reviewed-by: Serge Martin <edb+mesa@sigluy.net>
Tested-by: Jan Vesely <jan.vesely@rutgers.edu>
Diffstat (limited to 'src/gallium/state_trackers/clover/core')
-rw-r--r-- | src/gallium/state_trackers/clover/core/compiler.hpp | 3 | ||||
-rw-r--r-- | src/gallium/state_trackers/clover/core/program.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/clover/core/compiler.hpp b/src/gallium/state_trackers/clover/core/compiler.hpp index 2076417..0ed81fb 100644 --- a/src/gallium/state_trackers/clover/core/compiler.hpp +++ b/src/gallium/state_trackers/clover/core/compiler.hpp @@ -36,9 +36,6 @@ namespace clover { const std::string &target, const std::string &opts, std::string &r_log); - - module compile_program_tgsi(const std::string &source, - std::string &r_log); } #endif diff --git a/src/gallium/state_trackers/clover/core/program.cpp b/src/gallium/state_trackers/clover/core/program.cpp index 6eebd9c..d863787 100644 --- a/src/gallium/state_trackers/clover/core/program.cpp +++ b/src/gallium/state_trackers/clover/core/program.cpp @@ -21,6 +21,7 @@ // #include "core/program.hpp" +#include "tgsi/invocation.hpp" using namespace clover; @@ -56,7 +57,7 @@ program::build(const ref_vector<device> &devs, const char *opts, try { auto module = (dev.ir_format() == PIPE_SHADER_IR_TGSI ? - compile_program_tgsi(_source, log) : + tgsi::compile_program(_source, log) : compile_program_llvm(_source, headers, dev.ir_format(), dev.ir_target(), build_opts(dev), |