summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/clover
diff options
context:
space:
mode:
authorSerge Martin <edb+mesa@sigluy.net>2016-05-17 16:03:12 +0200
committerFrancisco Jerez <currojerez@riseup.net>2016-07-11 20:34:34 -0700
commit7f6a4a4342c1444990c55a77c60516c38738d203 (patch)
tree5cfc56e968c3d541ebed278a05dec918507f9568 /src/gallium/state_trackers/clover
parent2a73ae662cb393bef0d2d0ab71bfd1072adbafb6 (diff)
downloadexternal_mesa3d-7f6a4a4342c1444990c55a77c60516c38738d203.zip
external_mesa3d-7f6a4a4342c1444990c55a77c60516c38738d203.tar.gz
external_mesa3d-7f6a4a4342c1444990c55a77c60516c38738d203.tar.bz2
clover: Change program::build opts argument to std::string.
Reviewed-by: Francisco Jerez <currojerez@riseup.net> Tested-by: Jan Vesely <jan.vesely@rutgers.edu>
Diffstat (limited to 'src/gallium/state_trackers/clover')
-rw-r--r--src/gallium/state_trackers/clover/core/program.cpp4
-rw-r--r--src/gallium/state_trackers/clover/core/program.hpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/clover/core/program.cpp b/src/gallium/state_trackers/clover/core/program.cpp
index d863787..2c51170 100644
--- a/src/gallium/state_trackers/clover/core/program.cpp
+++ b/src/gallium/state_trackers/clover/core/program.cpp
@@ -41,7 +41,7 @@ program::program(clover::context &ctx,
}
void
-program::build(const ref_vector<device> &devs, const char *opts,
+program::build(const ref_vector<device> &devs, const std::string &opts,
const header_map &headers) {
if (has_source) {
_devices = devs;
@@ -60,7 +60,7 @@ program::build(const ref_vector<device> &devs, const char *opts,
tgsi::compile_program(_source, log) :
compile_program_llvm(_source, headers,
dev.ir_format(),
- dev.ir_target(), build_opts(dev),
+ dev.ir_target(), opts,
log));
_binaries.insert({ &dev, module });
_logs.insert({ &dev, log });
diff --git a/src/gallium/state_trackers/clover/core/program.hpp b/src/gallium/state_trackers/clover/core/program.hpp
index 183145e..8a7be7a 100644
--- a/src/gallium/state_trackers/clover/core/program.hpp
+++ b/src/gallium/state_trackers/clover/core/program.hpp
@@ -47,7 +47,7 @@ namespace clover {
program &
operator=(const program &prog) = delete;
- void build(const ref_vector<device> &devs, const char *opts,
+ void build(const ref_vector<device> &devs, const std::string &opts,
const header_map &headers = {});
const bool has_source;