From: Emil Velikov Date: Tue, 21 Jun 2016 17:21:54 +0000 (+0100) Subject: clover: conditionally use MESA_GIT_SHA1 X-Git-Tag: upstream/17.1.0~8290 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f98530b73960af1cb17da80159350fbe51352fea;p=platform%2Fupstream%2Fmesa.git clover: conditionally use MESA_GIT_SHA1 Considering how hard/annoying it was for many peoples' workflow to properly generate the macro, it will be demoted to conditionally available with follow-up commits. v2: Kill off gracious blank line (Vedran). Cc: mesa-stable@lists.freedesktop.org Cc: Vedran Miletić Cc: Francisco Jerez Signed-off-by: Emil Velikov Reviewed-by: Eric Engestrom (v1) Reviewed-by: Vedran Miletić --- diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/state_trackers/clover/api/device.cpp index ed323e0..11f21e9 100644 --- a/src/gallium/state_trackers/clover/api/device.cpp +++ b/src/gallium/state_trackers/clover/api/device.cpp @@ -302,7 +302,10 @@ clGetDeviceInfo(cl_device_id d_dev, cl_device_info param, case CL_DEVICE_VERSION: buf.as_string() = "OpenCL 1.1 Mesa " PACKAGE_VERSION - " (" MESA_GIT_SHA1 ")"; +#ifdef MESA_GIT_SHA1 + " (" MESA_GIT_SHA1 ")" +#endif + ; 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 cdb8a99..b1b1fdf 100644 --- a/src/gallium/state_trackers/clover/api/platform.cpp +++ b/src/gallium/state_trackers/clover/api/platform.cpp @@ -59,7 +59,10 @@ clover::GetPlatformInfo(cl_platform_id d_platform, cl_platform_info param, case CL_PLATFORM_VERSION: buf.as_string() = "OpenCL 1.1 Mesa " PACKAGE_VERSION - " (" MESA_GIT_SHA1 ")"; +#ifdef MESA_GIT_SHA1 + " (" MESA_GIT_SHA1 ")" +#endif + ; break; case CL_PLATFORM_NAME: