Vedran Miletić <[email protected]> writes: > Change MESA into Mesa in CL_PLATFORM_VERSION and CL_DEVICE_VERSION. For > both, always append git version suffix from git_sha1.h. > > v4: dropped #ifdef guards. > > It would be very nice if this could be considered for 12.0 release. > --- > src/gallium/state_trackers/clover/api/device.cpp | 5 ++++- > src/gallium/state_trackers/clover/api/platform.cpp | 5 ++++- > 2 files changed, 8 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..0d3de45 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" > > using namespace clover; > > @@ -300,7 +301,9 @@ 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 > + " (" MESA_GIT_SHA1 ")" > + ;
No need to put the semicolon in a separate line.
> break;
>
> case CL_DEVICE_EXTENSIONS:
> diff --git a/src/gallium/state_trackers/clover/api/platform.cpp
> b/src/gallium/state_trackers/clover/api/platform.cpp
> index cf71593..1784fbc 100644
> --- a/src/gallium/state_trackers/clover/api/platform.cpp
> +++ b/src/gallium/state_trackers/clover/api/platform.cpp
> @@ -22,6 +22,7 @@
>
> #include "api/util.hpp"
> #include "core/platform.hpp"
> +#include "git_sha1.h"
>
> using namespace clover;
>
> @@ -57,7 +58,9 @@ clover::GetPlatformInfo(cl_platform_id d_platform,
> cl_platform_info param,
> break;
>
> case CL_PLATFORM_VERSION:
> - buf.as_string() = "OpenCL 1.1 MESA " PACKAGE_VERSION;
> + buf.as_string() = "OpenCL 1.1 Mesa " PACKAGE_VERSION
> + " (" MESA_GIT_SHA1 ")"
> + ;
Same here. With my nitpicks addressed:
Reviewed-by: Francisco Jerez <[email protected]>
> break;
>
> case CL_PLATFORM_NAME:
> --
> 2.7.4
>
> _______________________________________________
> mesa-dev mailing list
> [email protected]
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
signature.asc
Description: PGP signature
_______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
