diff options
| author | Eric Engestrom <[email protected]> | 2018-08-14 18:04:58 +0100 |
|---|---|---|
| committer | Eric Engestrom <[email protected]> | 2018-08-16 17:38:31 +0100 |
| commit | bc8abc1adf0355b54e552c0944b8742d237bd1b0 (patch) | |
| tree | f9fa0ddc2ef9bc2804a51bfa1770d4c546679dff /src/gallium | |
| parent | 471f708ed6f4787813d0656c2457a6fc5738ddfc (diff) | |
bin: always define MESA_GIT_SHA1 to make it directly usable in code
Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/svga/svga_screen.c | 6 | ||||
| -rw-r--r-- | src/gallium/state_trackers/clover/api/device.cpp | 6 | ||||
| -rw-r--r-- | src/gallium/state_trackers/clover/api/platform.cpp | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index b8f936ee967..2a882577462 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -889,11 +889,7 @@ init_logging(struct pipe_screen *screen) svga_host_log(host_log); util_snprintf(host_log, sizeof(host_log) - strlen(log_prefix), - "%s%s" -#ifdef MESA_GIT_SHA1 - " (" MESA_GIT_SHA1 ")" -#endif - , log_prefix, PACKAGE_VERSION); + "%s%s" MESA_GIT_SHA1, log_prefix, PACKAGE_VERSION); svga_host_log(host_log); /* If the SVGA_EXTRA_LOGGING env var is set, log the process's command diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/state_trackers/clover/api/device.cpp index 3572bb0c921..5a4f94c1141 100644 --- a/src/gallium/state_trackers/clover/api/device.cpp +++ b/src/gallium/state_trackers/clover/api/device.cpp @@ -322,11 +322,7 @@ clGetDeviceInfo(cl_device_id d_dev, cl_device_info param, break; case CL_DEVICE_VERSION: - buf.as_string() = "OpenCL " + dev.device_version() + " Mesa " PACKAGE_VERSION -#ifdef MESA_GIT_SHA1 - " (" MESA_GIT_SHA1 ")" -#endif - ; + buf.as_string() = "OpenCL " + dev.device_version() + " 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 3b96b03fde8..fddbbecaa59 100644 --- a/src/gallium/state_trackers/clover/api/platform.cpp +++ b/src/gallium/state_trackers/clover/api/platform.cpp @@ -62,11 +62,7 @@ clover::GetPlatformInfo(cl_platform_id d_platform, cl_platform_info param, static const std::string version_string = debug_get_option("CLOVER_PLATFORM_VERSION_OVERRIDE", "1.1"); - buf.as_string() = "OpenCL " + version_string + " Mesa " PACKAGE_VERSION -#ifdef MESA_GIT_SHA1 - " (" MESA_GIT_SHA1 ")" -#endif - ; + buf.as_string() = "OpenCL " + version_string + " Mesa " PACKAGE_VERSION MESA_GIT_SHA1; break; } case CL_PLATFORM_NAME: |