summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2016-06-21 18:21:54 +0100
committerEmil Velikov <[email protected]>2016-07-05 12:14:34 +0100
commitf98530b73960af1cb17da80159350fbe51352fea (patch)
treea5a21a69fa356d72462d7fff7bab618dfdb21b86 /src
parent9c9e3e7ee1c92e67e1ceac75181871524e78d024 (diff)
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: [email protected] Cc: Vedran Miletić <[email protected]> Cc: Francisco Jerez <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Eric Engestrom <[email protected]> (v1) Reviewed-by: Vedran Miletić <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/state_trackers/clover/api/device.cpp5
-rw-r--r--src/gallium/state_trackers/clover/api/platform.cpp5
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 ed323e09afc..11f21e94eae 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 cdb8a9903b4..b1b1fdfb6f2 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: