[Mesa-dev,46/47] clover: Add clLinkProgram (CL 1.2).

Submitted by Francisco Jerez on July 4, 2016, 12:51 a.m.

Details

Message ID 20160704005156.5703-47-currojerez@riseup.net
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Francisco Jerez July 4, 2016, 12:51 a.m.
From: Serge Martin <edb+mesa@sigluy.net>

[ Francisco Jerez: Use validate_build_common for error checking,
  simplify control flow slightly and handle additional exception
  types. ]

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
---
 src/gallium/state_trackers/clover/api/program.cpp | 31 ++++++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/gallium/state_trackers/clover/api/program.cpp b/src/gallium/state_trackers/clover/api/program.cpp
index 1836099..0303c1e 100644
--- a/src/gallium/state_trackers/clover/api/program.cpp
+++ b/src/gallium/state_trackers/clover/api/program.cpp
@@ -240,10 +240,33 @@  clCompileProgram(cl_program d_prog, cl_uint num_devs,
 CLOVER_API cl_program
 clLinkProgram(cl_context d_ctx, cl_uint num_devs, const cl_device_id *d_devs,
               const char *p_opts, cl_uint num_progs, const cl_program *d_progs,
-              void (*pfn_notify)(cl_program, void *), void *user_data,
-              cl_int *r_errcode) {
-   CLOVER_NOT_SUPPORTED_UNTIL("1.2");
-   ret_error(r_errcode, CL_LINKER_NOT_AVAILABLE);
+              void (*pfn_notify) (cl_program, void *), void *user_data,
+              cl_int *r_errcode) try {
+   auto &ctx = obj(d_ctx);
+   auto devs = (d_devs ? objs(d_devs, num_devs) :
+                ref_vector<device>(ctx.devices()));
+   auto opts = (p_opts ? p_opts : "");
+   auto progs = objs(d_progs, num_progs);
+   auto prog = create<program>(ctx);
+
+   validate_build_common(prog, num_devs, d_devs, pfn_notify, user_data);
+
+   try {
+      prog().link(devs, opts, progs);
+      ret_error(r_errcode, CL_SUCCESS);
+
+   } catch (build_error &e) {
+      ret_error(r_errcode, CL_LINK_PROGRAM_FAILURE);
+   }
+
+   return ret_object(prog);
+
+} catch (invalid_build_options_error &e) {
+   ret_error(r_errcode, CL_INVALID_LINKER_OPTIONS);
+   return NULL;
+
+} catch (error &e) {
+   ret_error(r_errcode, e);
    return NULL;
 }