[Mesa-stable] [PATCH] clover: Support multiple devices in clCreateContextFromType() v2

[Francisco Jerez]

Tom Stellard <tom at stellard.net> writes:

> From: Tom Stellard <thomas.stellard at amd.com>
>
> v2:
>   - Use clGetDeviceIDs to query devices.
>
> CC: "10.0" <mesa-stable at lists.freedesktop.org>

Thank you, this patch is:

Reviewed-by: Francisco Jerez <currojerez at riseup.net>

> ---
>  src/gallium/state_trackers/clover/api/context.cpp | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/state_trackers/clover/api/context.cpp b/src/gallium/state_trackers/clover/api/context.cpp
> index 7b020a6..a78c00b 100644
> --- a/src/gallium/state_trackers/clover/api/context.cpp
> +++ b/src/gallium/state_trackers/clover/api/context.cpp
> @@ -61,18 +61,24 @@ clCreateContextFromType(const cl_context_properties *d_props,
>                          void *user_data, cl_int *r_errcode) try {
>     cl_platform_id d_platform;
>     cl_uint num_platforms;
> -   cl_device_id d_dev;
>     cl_int ret;
> +   std::vector<cl_device_id> devs;
> +   cl_uint num_devices;
>  
>     ret = clGetPlatformIDs(1, &d_platform, &num_platforms);
>     if (ret || !num_platforms)
>        throw error(CL_INVALID_PLATFORM);
>  
> -   ret = clGetDeviceIDs(d_platform, type, 1, &d_dev, 0);
> +   ret = clGetDeviceIDs(d_platform, type, 0, NULL, &num_devices);
> +   if (ret)
> +      throw error(CL_DEVICE_NOT_FOUND);
> +   devs.resize(num_devices);
> +   ret = clGetDeviceIDs(d_platform, type, num_devices, devs.data(), 0);
>     if (ret)
>        throw error(CL_DEVICE_NOT_FOUND);
>  
> -   return clCreateContext(d_props, 1, &d_dev, pfn_notify, user_data, r_errcode);
> +   return clCreateContext(d_props, num_devices, devs.data(), pfn_notify,
> +                          user_data, r_errcode);
>  
>  } catch (error &e) {
>     ret_error(r_errcode, e);
> -- 
> 1.8.1.4
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 229 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-stable/attachments/20131114/f558bfb3/attachment.pgp>