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/mesa/main | |
| 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/mesa/main')
| -rw-r--r-- | src/mesa/main/context.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/version.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 0ef8fe32a63..7eea60f12a0 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -404,11 +404,7 @@ one_time_init( struct gl_context *ctx ) #if defined(DEBUG) if (MESA_VERBOSE != 0) { - _mesa_debug(ctx, "Mesa " PACKAGE_VERSION " DEBUG build" -#ifdef MESA_GIT_SHA1 - " (" MESA_GIT_SHA1 ")" -#endif - "\n"); + _mesa_debug(ctx, "Mesa " PACKAGE_VERSION " DEBUG build" MESA_GIT_SHA1 "\n"); } #endif } diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 9df8c11c740..77ff51b6d9e 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -121,11 +121,7 @@ create_version_string(struct gl_context *ctx, const char *prefix) ctx->VersionString = malloc(max); if (ctx->VersionString) { _mesa_snprintf(ctx->VersionString, max, - "%s%u.%u%s Mesa " PACKAGE_VERSION -#ifdef MESA_GIT_SHA1 - " (" MESA_GIT_SHA1 ")" -#endif - , + "%s%u.%u%s Mesa " PACKAGE_VERSION MESA_GIT_SHA1, prefix, ctx->Version / 10, ctx->Version % 10, (ctx->API == API_OPENGL_CORE) ? " (Core Profile)" : |