From: Serge Martin <edb+mesa@sigluy.net>
Date: Tue, 17 May 2016 14:03:12 +0000 (+0200)
Subject: clover: Change program::build opts argument to std::string.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f6a4a4342c1444990c55a77c60516c38738d203;p=mesa.git

clover: Change program::build opts argument to std::string.

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Tested-by: Jan Vesely <jan.vesely@rutgers.edu>
---

diff --git a/src/gallium/state_trackers/clover/core/program.cpp b/src/gallium/state_trackers/clover/core/program.cpp
index d8637876cd4..2c511701e43 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 183145e2073..8a7be7a29c8 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;