[Mesa-dev] [PATCH v3] clover: Update OpenCL version string to match OpenGL

[Emil Velikov]

On 3 June 2016 at 17:23, Vedran Miletić <vedran at miletic.net> wrote:
> Change MESA into Mesa in CL_PLATFORM_VERSION and CL_DEVICE_VERSION. For
> both, append git version suffix from git_sha1.h if available.
>
> Original idea from Giuseppe Bilotta <giuseppe.bilotta at gmail.com>.
> ---
>  src/gallium/state_trackers/clover/api/device.cpp   | 7 ++++++-
>  src/gallium/state_trackers/clover/api/platform.cpp | 7 ++++++-
>  2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/state_trackers/clover/api/device.cpp
> index bc93f91..fdf763a 100644
> --- a/src/gallium/state_trackers/clover/api/device.cpp
> +++ b/src/gallium/state_trackers/clover/api/device.cpp
> @@ -23,6 +23,7 @@
>  #include "api/util.hpp"
>  #include "core/platform.hpp"
>  #include "core/device.hpp"
> +#include "git_sha1.h"
>
Heh, I was going to mention about this missing include in v2.

>  using namespace clover;
>
> @@ -300,7 +301,11 @@ clGetDeviceInfo(cl_device_id d_dev, cl_device_info param,
>        break;
>
>     case CL_DEVICE_VERSION:
> -      buf.as_string() = "OpenCL 1.1 MESA " PACKAGE_VERSION;
> +      buf.as_string() = "OpenCL 1.1 Mesa " PACKAGE_VERSION
Not sure who much the MESA>Mesa change matters, so I'll leave that to others.

> +#ifdef MESA_GIT_SHA1
> +                        " (" MESA_GIT_SHA1 ")"
> +#endif
... but here please drop the ifdef guard. Same goes for the other file.

Please give it some time for others to weight in before sending out v4.

Thanks
Emil