On 06/22/2016 02:04 PM, Emil Velikov wrote:
From: Emil Velikov <emil.veli...@collabora.com>
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.
Cc: mesa-sta...@lists.freedesktop.org
Cc: Vedran Miletić <ved...@miletic.net>
Cc: Francisco Jerez <curroje...@riseup.net>
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
src/gallium/state_trackers/clover/api/device.cpp | 6 +++++-
src/gallium/state_trackers/clover/api/platform.cpp | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/clover/api/device.cpp
b/src/gallium/state_trackers/clover/api/device.cpp
index ed323e0..7ad01d9 100644
--- a/src/gallium/state_trackers/clover/api/device.cpp
+++ b/src/gallium/state_trackers/clover/api/device.cpp
@@ -302,7 +302,11 @@ 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 ")"
+
This newline is unnecessary.
+#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:
With the comment above addressed, this patch is:
Reviewed-by: Vedran Miletić <ved...@miletic.net>
--
Vedran Miletić
vedran.miletic.net
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
