From: Vedran Miletić <vedran@miletic.net>
Date: Mon, 6 Jun 2016 10:43:33 +0000 (+0200)
Subject: clover: Update OpenCL version string to match OpenGL
X-Git-Tag: upstream/17.1.0~8759
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4825264f75c83576f251290547f121f066b46a70;p=platform%2Fupstream%2Fmesa.git

clover: Update OpenCL version string to match OpenGL

Change MESA into Mesa in CL_PLATFORM_VERSION and CL_DEVICE_VERSION. For
both, always append git version suffix from git_sha1.h.

v5: move semicolon to same line as MESA_GIT_SHA1.
v4: drop #ifdef guards.
v3: add missing include.
v2: change CL_DEVICE_VERSION as well.

Cc: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
---

diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/state_trackers/clover/api/device.cpp
index bc93f91..ed323e0 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,8 @@ 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 ")";
       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..cdb8a99 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,8 @@ 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 ")";
       break;
 
    case CL_PLATFORM_NAME: