Re: [Mesa-dev] [PATCH v3 21/21] clover: Use OpenCL 2.1 defines in place of cl_khr_il_program

[Pierre Moreau]

> I think this can be merged into patches 17 and 18, no?

You are right, will do.

> On Wed, Feb 21, 2018 at 11:50 PM, Pierre Moreau  wrote:
> > Signed-off-by: Pierre Moreau 
> > ---
> >  src/gallium/state_trackers/clover/api/device.cpp  | 3 +--
> >  src/gallium/state_trackers/clover/api/program.cpp | 2 +-
> >  2 files changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/src/gallium/state_trackers/clover/api/device.cpp 
> > b/src/gallium/state_trackers/clover/api/device.cpp
> > index 9132044b9c..9c19694c20 100644
> > --- a/src/gallium/state_trackers/clover/api/device.cpp
> > +++ b/src/gallium/state_trackers/clover/api/device.cpp
> > @@ -333,11 +333,10 @@ clGetDeviceInfo(cl_device_id d_dev, cl_device_info 
> > param,
> >buf.as_string() = dev.supported_extensions();
> >break;
> >
> > -   case CL_DEVICE_IL_VERSION_KHR:
> > +   case CL_DEVICE_IL_VERSION:
> >if (dev.supported_extensions().find("cl_khr_il_program") == 
> > std::string::npos)
> >   throw error(CL_INVALID_VALUE);
> >buf.as_string() = std::string("SPIR-V_1.0");
> > -
> >break;
> >
> > case CL_DEVICE_PLATFORM:
> > diff --git a/src/gallium/state_trackers/clover/api/program.cpp 
> > b/src/gallium/state_trackers/clover/api/program.cpp
> > index c920168250..0dea2f81fa 100644
> > --- a/src/gallium/state_trackers/clover/api/program.cpp
> > +++ b/src/gallium/state_trackers/clover/api/program.cpp
> > @@ -460,7 +460,7 @@ clGetProgramInfo(cl_program d_prog, cl_program_info 
> > param,
> >buf.as_string() = prog.source();
> >break;
> >
> > -   case CL_PROGRAM_IL_KHR:
> > +   case CL_PROGRAM_IL:
> >if (prog.has_il)
> >   buf.as_vector() = prog.il();
> >else if (r_size)
> > --
> > 2.16.2
> >


signature.asc
Description: PGP signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH v3 21/21] clover: Use OpenCL 2.1 defines in place of cl_khr_il_program

[Karol Herbst]

I think this can be merged into patches 17 and 18, no?

On Wed, Feb 21, 2018 at 11:50 PM, Pierre Moreau  wrote:
> Signed-off-by: Pierre Moreau 
> ---
>  src/gallium/state_trackers/clover/api/device.cpp  | 3 +--
>  src/gallium/state_trackers/clover/api/program.cpp | 2 +-
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/state_trackers/clover/api/device.cpp 
> b/src/gallium/state_trackers/clover/api/device.cpp
> index 9132044b9c..9c19694c20 100644
> --- a/src/gallium/state_trackers/clover/api/device.cpp
> +++ b/src/gallium/state_trackers/clover/api/device.cpp
> @@ -333,11 +333,10 @@ clGetDeviceInfo(cl_device_id d_dev, cl_device_info 
> param,
>buf.as_string() = dev.supported_extensions();
>break;
>
> -   case CL_DEVICE_IL_VERSION_KHR:
> +   case CL_DEVICE_IL_VERSION:
>if (dev.supported_extensions().find("cl_khr_il_program") == 
> std::string::npos)
>   throw error(CL_INVALID_VALUE);
>buf.as_string() = std::string("SPIR-V_1.0");
> -
>break;
>
> case CL_DEVICE_PLATFORM:
> diff --git a/src/gallium/state_trackers/clover/api/program.cpp 
> b/src/gallium/state_trackers/clover/api/program.cpp
> index c920168250..0dea2f81fa 100644
> --- a/src/gallium/state_trackers/clover/api/program.cpp
> +++ b/src/gallium/state_trackers/clover/api/program.cpp
> @@ -460,7 +460,7 @@ clGetProgramInfo(cl_program d_prog, cl_program_info param,
>buf.as_string() = prog.source();
>break;
>
> -   case CL_PROGRAM_IL_KHR:
> +   case CL_PROGRAM_IL:
>if (prog.has_il)
>   buf.as_vector() = prog.il();
>else if (r_size)
> --
> 2.16.2
>
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev