mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 05:18:08 +02:00
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> (cherry picked from commit4825264f75) Squashed with commit clover: Include generated sources in AM_CPPFLAGS git_sha1.c is generated in $(top_builddir)/src. Fixes out-of-tree builds since4825264f75. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96516 Signed-off-by: Aaron Watry <awatry@gmail.com> Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com> (cherry picked from commitfafe026dbe)
This commit is contained in:
parent
547b5d2daa
commit
a71e0fd8cd
3 changed files with 7 additions and 2 deletions
|
|
@ -7,6 +7,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/src/gallium/drivers \
|
||||
-I$(top_srcdir)/src/gallium/auxiliary \
|
||||
-I$(top_srcdir)/src/gallium/winsys \
|
||||
-I$(top_builddir)/src \
|
||||
-I$(srcdir)
|
||||
|
||||
if HAVE_CLOVER_ICD
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue