diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2016-05-17 16:03:18 +0200 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2016-07-11 20:34:35 -0700 |
| commit | c478db6c0a54307b0ec816e63e86deb04a130b9c (patch) | |
| tree | 344d6f7c6f59f4e4b1ae4de7215f51656eeb4f7a /src/gallium/state_trackers/clover | |
| parent | 9c7cda27929364804b34424bf4568d767490316d (diff) | |
| download | external_mesa3d-c478db6c0a54307b0ec816e63e86deb04a130b9c.zip external_mesa3d-c478db6c0a54307b0ec816e63e86deb04a130b9c.tar.gz external_mesa3d-c478db6c0a54307b0ec816e63e86deb04a130b9c.tar.bz2 | |
clover: Trivial cleanups for api/program.cpp.
Reviewed-by: Serge Martin <edb+mesa@sigluy.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/api/program.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/gallium/state_trackers/clover/api/program.cpp b/src/gallium/state_trackers/clover/api/program.cpp index 2dc9ee7..1836099 100644 --- a/src/gallium/state_trackers/clover/api/program.cpp +++ b/src/gallium/state_trackers/clover/api/program.cpp @@ -28,12 +28,12 @@ using namespace clover; namespace { - void validate_build_program_common(const program &prog, cl_uint num_devs, - const cl_device_id *d_devs, - void (*pfn_notify)(cl_program, void *), - void *user_data) { - - if ((!pfn_notify && user_data)) + void + validate_build_common(const program &prog, cl_uint num_devs, + const cl_device_id *d_devs, + void (*pfn_notify)(cl_program, void *), + void *user_data) { + if (!pfn_notify && user_data) throw error(CL_INVALID_VALUE); if (prog.kernel_ref_count()) @@ -179,7 +179,7 @@ clBuildProgram(cl_program d_prog, cl_uint num_devs, ref_vector<device>(prog.context().devices())); auto opts = (p_opts ? p_opts : ""); - validate_build_program_common(prog, num_devs, d_devs, pfn_notify, user_data); + validate_build_common(prog, num_devs, d_devs, pfn_notify, user_data); if (prog.has_source) { prog.compile(devs, opts); @@ -205,7 +205,7 @@ clCompileProgram(cl_program d_prog, cl_uint num_devs, auto opts = (p_opts ? p_opts : ""); header_map headers; - validate_build_program_common(prog, num_devs, d_devs, pfn_notify, user_data); + validate_build_common(prog, num_devs, d_devs, pfn_notify, user_data); if (bool(num_headers) != bool(header_names)) throw error(CL_INVALID_VALUE); @@ -213,7 +213,6 @@ clCompileProgram(cl_program d_prog, cl_uint num_devs, if (!prog.has_source) throw error(CL_INVALID_OPERATION); - for_each([&](const char *name, const program &header) { if (!header.has_source) throw error(CL_INVALID_OPERATION); |