fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 05:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Replace MESA_VERSION with PACKAGE_VERSION.

Browse source 
One fewer place to have to update.

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Matt Turner 2013-03-09 00:25:45 -08:00
parent 42c1b33f6d
commit 439c3d4e31
11 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/state_trackers/clover/Makefile.am
View file

@ -2,7 +2,6 @@ AUTOMAKE_OPTIONS = subdir-objects
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(GALLIUM_PIPE_LOADER_DEFINES) \ $(GALLIUM_PIPE_LOADER_DEFINES) \
-DMESA_VERSION=\"$(MESA_VERSION)\" \
-DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \ -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/include \

4
src/gallium/state_trackers/clover/api/device.cpp
View file

@ -217,13 +217,13 @@ clGetDeviceInfo(cl_device_id dev, cl_device_info param,
return string_property(buf, size, size_ret, dev->vendor_name()); return string_property(buf, size, size_ret, dev->vendor_name());
case CL_DRIVER_VERSION: case CL_DRIVER_VERSION:
return string_property(buf, size, size_ret, MESA_VERSION); return string_property(buf, size, size_ret, PACKAGE_VERSION);
case CL_DEVICE_PROFILE: case CL_DEVICE_PROFILE:
return string_property(buf, size, size_ret, "FULL_PROFILE"); return string_property(buf, size, size_ret, "FULL_PROFILE");
case CL_DEVICE_VERSION: case CL_DEVICE_VERSION:
return string_property(buf, size, size_ret, "OpenCL 1.1 MESA " MESA_VERSION); return string_property(buf, size, size_ret, "OpenCL 1.1 MESA " PACKAGE_VERSION);
case CL_DEVICE_EXTENSIONS: case CL_DEVICE_EXTENSIONS:
return string_property(buf, size, size_ret, ""); return string_property(buf, size, size_ret, "");

2
src/gallium/state_trackers/clover/api/platform.cpp
View file

@ -51,7 +51,7 @@ clGetPlatformInfo(cl_platform_id platform, cl_platform_info param_name,
case CL_PLATFORM_VERSION: case CL_PLATFORM_VERSION:
return string_property(buf, size, size_ret, return string_property(buf, size, size_ret,
"OpenCL 1.1 MESA " MESA_VERSION); "OpenCL 1.1 MESA " PACKAGE_VERSION);
case CL_PLATFORM_NAME: case CL_PLATFORM_NAME:
return string_property(buf, size, size_ret, "Default"); return string_property(buf, size, size_ret, "Default");

3
src/gallium/state_trackers/vega/Makefile.am
View file

@ -25,8 +25,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = $(GALLIUM_CFLAGS) AM_CFLAGS = $(GALLIUM_CFLAGS)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mapi
-DVEGA_VERSION_STRING=\"$(MESA_VERSION)\"
noinst_LTLIBRARIES = libvega.la noinst_LTLIBRARIES = libvega.la

2
src/gallium/state_trackers/vega/SConscript
View file

@ -12,7 +12,7 @@ env.Append(CPPPATH = [
Dir('.'), Dir('.'),
]) ])
env.Append(CPPDEFINES = [ env.Append(CPPDEFINES = [
'VEGA_VERSION_STRING=', 'PACKAGE_VERSION='
'KHRONOS_DLL_EXPORTS', 'KHRONOS_DLL_EXPORTS',
]) ])

2
src/gallium/state_trackers/vega/vg_manager.c
View file

@ -370,7 +370,7 @@ vg_api_destroy(struct st_api *stapi)
} }
static const struct st_api vg_api = { static const struct st_api vg_api = {
"Vega " VEGA_VERSION_STRING, "Vega " PACKAGE_VERSION,
ST_API_OPENVG, ST_API_OPENVG,
ST_PROFILE_DEFAULT_MASK, ST_PROFILE_DEFAULT_MASK,
0, 0,

2
src/mesa/drivers/x11/fakeglx.c
View file

@ -63,7 +63,7 @@
#define SERVER_MINOR_VERSION 4 #define SERVER_MINOR_VERSION 4
/* This is appended onto the glXGetClient/ServerString version strings. */ /* This is appended onto the glXGetClient/ServerString version strings. */
#define MESA_GLX_VERSION "Mesa " MESA_VERSION_STRING #define MESA_GLX_VERSION "Mesa " PACKAGE_VERSION
/* Who implemented this GLX? */ /* Who implemented this GLX? */
#define VENDOR "Brian Paul" #define VENDOR "Brian Paul"

2
src/mesa/main/context.c
View file

@ -410,7 +410,7 @@ one_time_init( struct gl_context *ctx )
#if defined(DEBUG) && defined(__DATE__) && defined(__TIME__) #if defined(DEBUG) && defined(__DATE__) && defined(__TIME__)
if (MESA_VERBOSE != 0) { if (MESA_VERBOSE != 0) {
_mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n", _mesa_debug(ctx, "Mesa %s DEBUG build %s %s\n",
MESA_VERSION_STRING, __DATE__, __TIME__); PACKAGE_VERSION, __DATE__, __TIME__);
} }
#endif #endif

2
src/mesa/main/errors.c
View file

@ -848,7 +848,7 @@ _mesa_problem( const struct gl_context *ctx, const char *fmtString, ... )
_mesa_vsnprintf( str, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args ); _mesa_vsnprintf( str, MAX_DEBUG_MESSAGE_LENGTH, fmtString, args );
va_end( args ); va_end( args );
fprintf(stderr, "Mesa %s implementation error: %s\n", fprintf(stderr, "Mesa %s implementation error: %s\n",
MESA_VERSION_STRING, str); PACKAGE_VERSION, str);
fprintf(stderr, "Please report at bugs.freedesktop.org\n"); fprintf(stderr, "Please report at bugs.freedesktop.org\n");
} }
} }

2
src/mesa/main/version.c
View file

@ -99,7 +99,7 @@ create_version_string(struct gl_context *ctx, const char *prefix)
ctx->VersionString = malloc(max); ctx->VersionString = malloc(max);
if (ctx->VersionString) { if (ctx->VersionString) {
_mesa_snprintf(ctx->VersionString, max, _mesa_snprintf(ctx->VersionString, max,
"%s%u.%u%s Mesa " MESA_VERSION_STRING "%s%u.%u%s Mesa " PACKAGE_VERSION
#ifdef MESA_GIT_SHA1 #ifdef MESA_GIT_SHA1
" (" MESA_GIT_SHA1 ")" " (" MESA_GIT_SHA1 ")"
#endif #endif

2
src/mesa/state_tracker/st_manager.c
View file

@ -883,7 +883,7 @@ st_manager_add_color_renderbuffer(struct st_context *st,
} }
static const struct st_api st_gl_api = { static const struct st_api st_gl_api = {
"Mesa " MESA_VERSION_STRING, "Mesa " PACKAGE_VERSION,
ST_API_OPENGL, ST_API_OPENGL,
#if FEATURE_GL #if FEATURE_GL
ST_PROFILE_DEFAULT_MASK | ST_PROFILE_DEFAULT_MASK |