diff options
| -rw-r--r-- | docs/envvars.html | 15 | ||||
| -rw-r--r-- | src/gallium/state_trackers/clover/api/program.cpp | 10 |
2 files changed, 22 insertions, 3 deletions
diff --git a/docs/envvars.html b/docs/envvars.html index cf57ca59da5..af1a30c68ef 100644 --- a/docs/envvars.html +++ b/docs/envvars.html @@ -235,6 +235,21 @@ Setting to "tgsi", for example, will print all the TGSI shaders. See src/mesa/state_tracker/st_debug.c for other options. </ul> +<h3>Clover state tracker environment variables</h3> + +<ul> +<li>CLOVER_EXTRA_BUILD_OPTIONS - allows specifying additional compiler and linker + options. Specified options are appended after the options set by the OpenCL + program in clBuildProgram. +<li>CLOVER_EXTRA_COMPILE_OPTIONS - allows specifying additional compiler + options. Specified options are appended after the options set by the OpenCL + program in clCompileProgram. +<li>CLOVER_EXTRA_LINK_OPTIONS - allows specifying additional linker + options. Specified options are appended after the options set by the OpenCL + program in clLinkProgram. +</ul> + + <h3>Softpipe driver environment variables</h3> <ul> <li>SOFTPIPE_DUMP_FS - if set, the softpipe driver will print fragment shaders diff --git a/src/gallium/state_trackers/clover/api/program.cpp b/src/gallium/state_trackers/clover/api/program.cpp index c3f9cb97f5b..ba4ce7a0c4a 100644 --- a/src/gallium/state_trackers/clover/api/program.cpp +++ b/src/gallium/state_trackers/clover/api/program.cpp @@ -22,6 +22,7 @@ #include "api/util.hpp" #include "core/program.hpp" +#include "util/u_debug.h" #include <sstream> @@ -177,7 +178,8 @@ clBuildProgram(cl_program d_prog, cl_uint num_devs, auto &prog = obj(d_prog); auto devs = (d_devs ? objs(d_devs, num_devs) : ref_vector<device>(prog.context().devices())); - auto opts = (p_opts ? p_opts : ""); + const auto opts = std::string(p_opts ? p_opts : "") + " " + + debug_get_option("CLOVER_EXTRA_BUILD_OPTIONS", ""); validate_build_common(prog, num_devs, d_devs, pfn_notify, user_data); @@ -202,7 +204,8 @@ clCompileProgram(cl_program d_prog, cl_uint num_devs, auto &prog = obj(d_prog); auto devs = (d_devs ? objs(d_devs, num_devs) : ref_vector<device>(prog.context().devices())); - auto opts = (p_opts ? p_opts : ""); + const auto opts = std::string(p_opts ? p_opts : "") + " " + + debug_get_option("CLOVER_EXTRA_COMPILE_OPTIONS", ""); header_map headers; validate_build_common(prog, num_devs, d_devs, pfn_notify, user_data); @@ -271,7 +274,8 @@ clLinkProgram(cl_context d_ctx, cl_uint num_devs, const cl_device_id *d_devs, void (*pfn_notify) (cl_program, void *), void *user_data, cl_int *r_errcode) try { auto &ctx = obj(d_ctx); - auto opts = (p_opts ? p_opts : ""); + const auto opts = std::string(p_opts ? p_opts : "") + " " + + debug_get_option("CLOVER_EXTRA_LINK_OPTIONS", ""); auto progs = objs(d_progs, num_progs); auto prog = create<program>(ctx); auto devs = validate_link_devices(progs, |