summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVedran Miletić <[email protected]>2016-06-06 12:43:33 +0200
committerFrancisco Jerez <[email protected]>2016-06-13 15:55:59 -0700
commit4825264f75c83576f251290547f121f066b46a70 (patch)
tree49a386cbdd559f2ba6573e13120e1aacc8a9f901 /src
parentbd9f9726519fad94e88b9266b0c255aa00251f4d (diff)
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: <[email protected]> Reviewed-by: Francisco Jerez <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/state_trackers/clover/api/device.cpp4
-rw-r--r--src/gallium/state_trackers/clover/api/platform.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/state_trackers/clover/api/device.cpp
index bc93f91d0ec..ed323e09afc 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 cf71593693e..cdb8a9903b4 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: