fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

clover: Fix clBuildProgram piglit regression

Browse source 
Should trigger CL_INVALID_VALUE if device_list is NULL and num_devices
is greater than zero.

Introduced by e5468dfa52

Reported by: EdB

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
This commit is contained in:
Tom Stellard 2014-11-03 09:14:01 -05:00
parent bfd453f942
commit 263eb7fa39
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/state_trackers/clover/api/program.cpp
View file

@ -27,7 +27,7 @@ using namespace clover;
namespace {
void validate_build_program_common(const program &prog, cl_uint num_devs,
const ref_vector<device> &devs,
const cl_device_id *d_devs,
void (*pfn_notify)(cl_program, void *),
void *user_data) {
@ -39,7 +39,7 @@ namespace {
if (any_of([&](const device &dev) {
return !count(dev, prog.context().devices());
}, devs))
}, objs<allow_empty_tag>(d_devs, num_devs)))
throw error(CL_INVALID_DEVICE);
}
}
@ -177,7 +177,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, devs, pfn_notify, user_data);
validate_build_program_common(prog, num_devs, d_devs, pfn_notify, user_data);
prog.build(devs, opts);
return CL_SUCCESS;
@ -200,7 +200,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, devs, pfn_notify, user_data);
validate_build_program_common(prog, num_devs, d_devs, pfn_notify, user_data);
if (bool(num_headers) != bool(header_names))
throw error(CL_INVALID_VALUE);